contrib: fix libdsm and libtasn1 rules

[vlc] / contrib / src / main.mak

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 2027af57e7a08a0c0ca09303e52642b2c5386b87..b42ea469fdd3ea1724aff6ce1e3f0014e09d9232 100644 (file)
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -91,14 +91,14 @@ endif
 endif
 
 ifdef HAVE_ANDROID
-CC :=  $(HOST)-gcc --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH)
-CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH)
+CC :=  $(HOST)-gcc --sysroot=$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT_ARCH)
+CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/$(ANDROID_API)/arch-$(PLATFORM_SHORT_ARCH)
 endif
 
 ifdef HAVE_MACOSX
 MIN_OSX_VERSION=10.6
-CC=xcrun llvm-gcc-4.2
-CXX=xcrun llvm-g++-4.2
+CC=xcrun cc
+CXX=xcrun c++
 AR=xcrun ar
 LD=xcrun ld
 STRIP=xcrun strip
@@ -123,23 +123,23 @@ endif
 
 endif
 
-CCAS=$(CC)
+CCAS=$(CC) -c
 
 ifdef HAVE_IOS
 CC=xcrun clang
 CXX=xcrun clang++
-ifeq ($(ARCH), arm)
+ifdef HAVE_NEON
 AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
+CCAS=gas-preprocessor.pl $(CC) -c
 else
-AS=xcrun as
+CCAS=$(CC) -c
 endif
-CCAS=gas-preprocessor.pl $(CC)
 AR=xcrun ar
 LD=xcrun ld
 STRIP=xcrun strip
 RANLIB=xcrun ranlib
-EXTRA_CFLAGS += -isysroot $(SDKROOT)  -miphoneos-version-min=5.0
-EXTRA_LDFLAGS += -Wl,-syslibroot,$(SDKROOT) -isysroot $(SDKROOT) -miphoneos-version-min=5.0
+EXTRA_CFLAGS += $(CFLAGS)
+EXTRA_LDFLAGS += $(LDFLAGS)
 endif
 
 ifdef HAVE_WIN32
@@ -148,6 +148,16 @@ HAVE_MINGW_W64 := 1
 endif
 endif
 
+ifdef HAVE_SOLARIS
+ifeq ($(ARCH),x86_64)
+EXTRA_CFLAGS += -m64
+EXTRA_LDFLAGS += -m64
+else
+EXTRA_CFLAGS += -m32
+EXTRA_LDFLAGS += -m32
+endif
+endif
+
 cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1))
 
 EXTRA_CFLAGS += -I$(PREFIX)/include
@@ -216,6 +226,12 @@ else
 download = $(error Neither curl nor wget found!)
 endif
 
+ifeq ($(shell which bzcat >/dev/null 2>&1 || echo FAIL),)
+BZCAT = bzcat
+else
+BZCAT ?= $(error Bunzip2 client (bzcat) not found!)
+endif
+
 ifeq ($(shell gzcat --version >/dev/null 2>&1 || echo FAIL),)
 ZCAT = gzcat
 else ifeq ($(shell zcat --version >/dev/null 2>&1 || echo FAIL),)
@@ -238,6 +254,9 @@ endif
 # Common helpers
 #
 HOSTCONF := --prefix="$(PREFIX)"
+HOSTCONF += --datarootdir="$(PREFIX)/share"
+HOSTCONF += --includedir="$(PREFIX)/include"
+HOSTCONF += --libdir="$(PREFIX)/lib"
 HOSTCONF += --build="$(BUILD)" --host="$(HOST)" --target="$(HOST)"
 HOSTCONF += --program-prefix=""
 # libtool stuff:
@@ -285,7 +304,7 @@ UNPACK = $(RM) -R $@ \
        $(foreach f,$(filter %.tar.bz2,$^), && tar xvjf $(f)) \
        $(foreach f,$(filter %.tar.xz,$^), && tar xvJf $(f)) \
        $(foreach f,$(filter %.zip,$^), && unzip $(f))
-UNPACK_DIR = $(basename $(basename $(notdir $<)))
+UNPACK_DIR = $(patsubst %.tar,%,$(basename $(notdir $<)))
 APPLY = (cd $(UNPACK_DIR) && patch -fp1) <
 pkg_static = (cd $(UNPACK_DIR) && ../../../contrib/src/pkg-static.sh $(1))
 MOVE = mv $(UNPACK_DIR) $@ && touch $@
@@ -356,7 +375,7 @@ prebuilt: vlc-contrib-$(HOST)-latest.tar.bz2
 package: install
        rm -Rf tmp/
        mkdir -p tmp/
-       cp -r $(PREFIX) tmp/
+       cp -R $(PREFIX) tmp/
        # remove useless files
        cd tmp/$(notdir $(PREFIX)); \
                cd share; rm -Rf man doc gtk-doc info lua projectM gettext; cd ..; \
@@ -394,9 +413,21 @@ ifdef HAVE_DARWIN_OS
        echo "set(CMAKE_C_FLAGS $(CFLAGS))" >> $@
        echo "set(CMAKE_CXX_FLAGS $(CFLAGS))" >> $@
        echo "set(CMAKE_LD_FLAGS $(LDFLAGS))" >> $@
+       echo "set(CMAKE_AR ar CACHE FILEPATH "Archiver")" >> $@
+ifdef HAVE_IOS
+       echo "set(CMAKE_OSX_SYSROOT $(IOS_SDK))" >> $@
+else
+       echo "set(CMAKE_OSX_SYSROOT $(MACOSX_SDK))" >> $@
+endif
 endif
 ifdef HAVE_CROSS_COMPILE
        echo "set(_CMAKE_TOOLCHAIN_PREFIX $(HOST)-)" >> $@
+ifdef HAVE_ANDROID
+# cmake will overwrite our --sysroot with a native (host) one on Darwin
+# Set it to "" right away to short-circuit this behaviour
+       echo "set(CMAKE_CXX_SYSROOT_FLAG \"\")" >> $@
+       echo "set(CMAKE_C_SYSROOT_FLAG \"\")" >> $@
+endif
 endif
        echo "set(CMAKE_C_COMPILER $(CC))" >> $@
        echo "set(CMAKE_CXX_COMPILER $(CXX))" >> $@