[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - curl/ExternalProject_curl.mk

[Michael Stahl]

 curl/ExternalProject_curl.mk |   22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 69ace4dd4efec6b7362663bb5fa3120180ec14a0
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Apr 18 15:20:58 2013 +0200

    curl: link against the internal NSS if SYSTEM_NSS=NO
    
    This is somewhat non-obvious since there is no way to override curl
    configure's use of pkg-config for NSS... it needs actually 2 include
    paths, and the --with-nss takes only one (which is extended with
    include/ and lib/).
    
    Thanks to Alex Thurgood for the report.
    
    Conflicts:
    	curl/ExternalProject_curl.mk
    
    Change-Id: I06074de50daad19a2cc62fe4090d3c0fbfdb2cb1
    (cherry picked from commit 075023b473b064e2cad84c3212602e1bb2bc9d1c)
    Reviewed-on: https://gerrit.libreoffice.org/3463
    Reviewed-by: David Ostrovsky <David.Ostrovsky at gmx.de>
    Tested-by: David Ostrovsky <David.Ostrovsky at gmx.de>

diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk
index 808441e..2cd9066 100644
--- a/curl/ExternalProject_curl.mk
+++ b/curl/ExternalProject_curl.mk
@@ -17,15 +17,31 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\
 
 ifeq ($(GUI),UNX)
 
+curl_CPPFLAGS :=
+curl_LDFLAGS :=
+
+ifneq ($(SYSBASE),)
+curl_CPPFLAGS += -I$(SYSBASE)/usr/include
+curl_LDFLAGS += -L$(SYSBASE)/usr/lib
+endif
+
+# there are 2 include paths, what is passed to --with-nss below is for libs...
+ifeq ($(SYSTEM_NSS),NO)
+curl_CPPFLAGS += -I$(OUTDIR)/inc/mozilla/nspr -I$(OUTDIR)/inc/mozilla/nss
+endif
+
 $(call gb_ExternalProject_get_state_target,curl,build):
 	cd $(EXTERNAL_WORKDIR) \
-	&& PATH=$(OUTDIR_FOR_BUILD)/bin:$$PATH ./configure --with-nss --without-ssl \
+	&&  CPPFLAGS="$(curl_CPPFLAGS)" \
+		LDFLAGS="$(curl_LDFLAGS)" \
+	./configure \
+			--with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(OUTDIR)/") \
+			--without-ssl \
 	--without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \
 	--disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \
 	$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
 	$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
-	$(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include" LDFLAGS="-L$(SYSBASE)/usr/lib") \
 	&& cd lib \
 	&& $(MAKE) \
 	&& touch $@
@@ -34,7 +50,7 @@ else ifeq ($(OS)$(COM),WNTGCC)
 
 $(call gb_ExternalProject_get_state_target,curl,build):
 	cd $(EXTERNAL_WORKDIR) \
-	&& PATH=$(OUTDIR_FOR_BUILD)/bin:$$PATH ./configure --with-nss --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher \
+	&& PATH=$(OUTDIR)/bin:$$PATH ./configure --with-nss --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher \
 	--disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 \
 	$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
 	CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \