From 22f1502fbf33e59d6c0b9060f5ab3b8f8595839b Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 24 Jun 2013 12:36:09 +0200 Subject: [PATCH] repair build (was broken to CA download) --- Makefile | 9 ++++++++- submodules/linphone | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 014cd15c9..d65fad585 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,13 @@ ifneq ($(CHECK_MSG),) endif include check_tools.mk +OPENSSL_DIR=$(shell openssl version -d | sed "s/OPENSSLDIR: \"\(.*\)\"/\1/") +ifneq ($(shell ls $(OPENSSL_DIR)/certs),) + HTTPS_CA_DIR=$(OPENSSL_DIR)/certs +else + HTTPS_CA_DOR=$(OPENSSL_DIR) +endif + NDK_BUILD_OPTIONS=NDK_DEBUG=$(NDK_DEBUG) LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_UPNP=$(BUILD_UPNP) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_FOR_X86=$(BUILD_FOR_X86) USE_JAVAH=$(USE_JAVAH) -j$(NUMCPUS) all: update-project prepare-sources generate-apk @@ -117,7 +124,7 @@ prepare-cunit: $(TOPDIR)/submodules/externals/cunit/CUnit/Headers/*.h cp $^ $(TOPDIR)/submodules/externals/build/cunit/CUnit $(TOPDIR)/res/raw/rootca.pem: - $(TOPDIR)/submodules/linphone/scripts/mk-ca-bundle.pl $@ + HTTPS_CA_DIR=$(HTTPS_CA_DIR) $(TOPDIR)/submodules/linphone/scripts/mk-ca-bundle.pl $@ prepare-liblinphone_tester: $(TOPDIR)/submodules/linphone/tester/*_lrc $(TOPDIR)/submodules/linphone/tester/*_rc $(TOPDIR)/submodules/linphone/tester/tester_hosts $(TOPDIR)/submodules/linphone/tester/certificates/* $(TOPDIR)/res/raw/rootca.pem cp -f $^ $(TOPDIR)/liblinphone_tester/res/raw/. diff --git a/submodules/linphone b/submodules/linphone index 392b36c24..866af779a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 392b36c2429e268f291d22882ab195d46c70d5d5 +Subproject commit 866af779abc0b74a53f3237d42d6db07e4426cc0