diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 5937f08ac2016207c8f60e57ab9502455a129254..086284ae17e1f2ca5e0a9e3f57e72a9a74c44583 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -93,6 +93,9 @@ 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) + +#FIXME: configure.sh should already be doing this, and 4.8 should be a variable +EXTRA_LDFLAGS += -L$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/4.8/libs/$(ANDROID_ABI) -lgnustl_static endif ifdef HAVE_MACOSX diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak index ea9cbc4ae7201ac0142d8edcf8e2f6cac9e51343..760743caadc52d1a0027cd65faf57834a0fa845e 100644 --- a/contrib/src/speex/rules.mak +++ b/contrib/src/speex/rules.mak @@ -20,7 +20,6 @@ speex: speex-$(SPEEX_VERSION).tar.gz .sum-speex rm -Rf $@-git $@ mkdir -p $@-git $(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1) - $(APPLY) $(SRC)/speex/0001-Add-disable-binaries-option-to-build-only-the-librar.patch $(MOVE) SPEEX_CONF := --disable-binaries diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak index a419cbd6a85ee4bcbb14e6dbc6083893fe827034..555de26c743bab9adf99a95a1df4a0d1f19684bf 100644 --- a/contrib/src/vpx/rules.mak +++ b/contrib/src/vpx/rules.mak @@ -90,7 +90,7 @@ endif ifdef HAVE_ANDROID # vpx configure.sh overrides our sysroot and it looks for it itself, and # uses that path to look for the compiler (which we already know) -VPX_CONF += --sdk-path=$(shell dirname $(shell which $(HOST)-gcc)) +VPX_CONF += --sdk-path=$(ANDROID_NDK) # needed for cpu-features.h VPX_CONF += --extra-cflags="-I $(ANDROID_NDK)/sources/cpufeatures/" endif diff --git a/contrib/src/zrtpcpp/nodemo.patch b/contrib/src/zrtpcpp/nodemo.patch new file mode 100644 index 0000000000000000000000000000000000000000..977af3bb9093de5c73bc92f78462b7b97486b55e --- /dev/null +++ b/contrib/src/zrtpcpp/nodemo.patch @@ -0,0 +1,13 @@ +--- zrtpcpp/CMakeLists.txt.orig 2014-08-01 13:09:30.402259035 -0400 ++++ zrtpcpp/CMakeLists.txt 2014-08-01 13:09:35.089304129 -0400 +@@ -167,10 +167,6 @@ + + add_subdirectory(src) + +-if (enable_ccrtp) +- add_subdirectory(demo) +-endif() +- + if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/package/) + MESSAGE(STATUS "package dir not found") + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/package/) diff --git a/contrib/src/zrtpcpp/rules.mak b/contrib/src/zrtpcpp/rules.mak index 849d70d034e385f700b191e2709d5fb5a0133560..a8d2dcf1f5a37a9bd78628b1babf133d7dc53e5f 100644 --- a/contrib/src/zrtpcpp/rules.mak +++ b/contrib/src/zrtpcpp/rules.mak @@ -23,6 +23,7 @@ zrtpcpp: libzrtpcpp-$(ZRTPCPP_VERSION).tar.gz .sum-zrtpcpp $(APPLY) $(SRC)/zrtpcpp/forcegcrypt.patch $(APPLY) $(SRC)/zrtpcpp/threadcbsupdate.patch $(APPLY) $(SRC)/zrtpcpp/standardheader.patch + $(APPLY) $(SRC)/zrtpcpp/nodemo.patch $(MOVE) .zrtpcpp: zrtpcpp toolchain.cmake