From e3abec3f07f2a710bfce66f77b33f494e2aa4972 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 11 Feb 2014 15:57:18 +0100 Subject: fdo#74825: fix missing lcms2/libxslt/curl in installation sets The assumption that all configure variables had been normalized to TRUE/ turned out not to hold; convert a bit more in that direction. (regression from 4af38b099c741c3676aefeb20c515913aaeed666) Change-Id: I2127c515e8a833a07c9b26ed9d693ce5a1853fe4 --- external/curl/ExternalProject_curl.mk | 4 ++-- external/libpng/Module_libpng.mk | 2 +- external/libxmlsec/ExternalProject_xmlsec.mk | 4 ++-- external/nss/Module_nss.mk | 2 +- external/openldap/ExternalProject_openldap.mk | 2 +- external/openssl/Module_openssl.mk | 2 +- external/postgresql/ExternalProject_postgresql.mk | 4 ++-- external/python3/ExternalProject_python3.mk | 4 ++-- external/redland/Module_redland.mk | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) (limited to 'external') diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 23161a0fea04..e67fdf230e4b 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -31,7 +31,7 @@ endif endif # there are 2 include paths, the other one is passed to --with-nss below -ifeq ($(SYSTEM_NSS),NO) +ifeq ($(SYSTEM_NSS),) curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss endif @@ -43,7 +43,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): ./configure \ $(if $(filter MACOSX IOS,$(OS)),\ --with-darwinssl, \ - --with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ + --with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ --without-ssl \ --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \ --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \ diff --git a/external/libpng/Module_libpng.mk b/external/libpng/Module_libpng.mk index d61375d18d05..31610d3db2fb 100644 --- a/external/libpng/Module_libpng.mk +++ b/external/libpng/Module_libpng.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,libpng)) -ifeq ($(SYSTEM_LIBPNG),NO) +ifeq ($(SYSTEM_LIBPNG),) $(eval $(call gb_Module_add_targets,libpng,\ StaticLibrary_png \ diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk index 2c4b18ab51ab..851a2680539c 100644 --- a/external/libxmlsec/ExternalProject_xmlsec.mk +++ b/external/libxmlsec/ExternalProject_xmlsec.mk @@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : autoreconf \ && ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ --without-libxslt --without-openssl --without-gnutls --disable-crypto-dl \ - $(if $(filter NO,$(SYSTEM_NSS)),--disable-pkgconfig) \ + $(if $(SYSTEM_NSS),,--disable-pkgconfig) \ CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ LDFLAGS="-Wl$(COMMA)--no-undefined $(ILIB:;= -L)" \ LIBS="$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED__LIBSTDCPP))" \ @@ -57,7 +57,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \ $(if $(or $(filter-out ANDROID,$(OS)),$(DISABLE_OPENSSL)),--without-openssl,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ + $(if $(SYSTEM_NSS),,$(if $(filter MACOSX,$(OS)),--disable-pkgconfig)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML_LIBS="-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")\ $(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \ diff --git a/external/nss/Module_nss.mk b/external/nss/Module_nss.mk index c1619ffb14d3..5bc94e566d62 100644 --- a/external/nss/Module_nss.mk +++ b/external/nss/Module_nss.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,nss)) -ifeq ($(SYSTEM_NSS),NO) +ifeq ($(SYSTEM_NSS),) ifeq ($(filter ANDROID IOS,$(OS)),) $(eval $(call gb_Module_add_targets,nss,\ UnpackedTarball_nss \ diff --git a/external/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk index 10de51fbfe42..022dc0ac149f 100644 --- a/external/openldap/ExternalProject_openldap.mk +++ b/external/openldap/ExternalProject_openldap.mk @@ -29,7 +29,7 @@ $(call gb_ExternalProject_get_state_target,openldap,build) : --with-yielding_select=yes \ ac_cv_func_memcmp_working=yes \ ) \ - $(if $(filter YES,$(SYSTEM_NSS)), \ + $(if $(SYSTEM_NSS), \ CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)" \ , \ CPPFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \ diff --git a/external/openssl/Module_openssl.mk b/external/openssl/Module_openssl.mk index 698aa071021f..002b7083af0f 100644 --- a/external/openssl/Module_openssl.mk +++ b/external/openssl/Module_openssl.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,openssl)) -ifeq ($(SYSTEM_OPENSSL),NO) +ifeq ($(SYSTEM_OPENSSL),) $(eval $(call gb_Module_add_targets,openssl,\ UnpackedTarball_openssl \ ExternalPackage_openssl \ diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index 3afa7b80ff28..cd9d8a2ede6a 100644 --- a/external/postgresql/ExternalProject_postgresql.mk +++ b/external/postgresql/ExternalProject_postgresql.mk @@ -32,7 +32,7 @@ postgresql_CPPFLAGS := $(ZLIB_CFLAGS) postgresql_LDFLAGS := ifeq ($(DISABLE_OPENSSL),) -ifeq ($(SYSTEM_OPENSSL),NO) +ifeq ($(SYSTEM_OPENSSL),) postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openssl)/include postgresql_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl)/ endif @@ -44,7 +44,7 @@ postgresql_LDFLAGS += \ -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap_r/.libs \ -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs \ -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs \ - $(if $(filter NO,$(SYSTEM_NSS)),\ + $(if $(SYSTEM_NSS),,\ -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib) \ endif diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 70063f0f52eb..9d620b749b6d 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -73,14 +73,14 @@ $(call gb_ExternalProject_get_state_target,python3,build) : --enable-shared \ ) \ CC="$(strip $(CC) \ - $(if $(filter NO,$(SYSTEM_OPENSSL)),-I$(call gb_UnpackedTarball_get_dir,openssl)/include \ + $(if $(SYSTEM_OPENSSL),,-I$(call gb_UnpackedTarball_get_dir,openssl)/include \ $(if $(DISABLE_OPENSSL),,-I$(call gb_UnpackedTarball_get_dir,openssl)/include)) \ $(if $(filter NO,$(SYSTEM_EXPAT)),-I$(call gb_UnpackedTarball_get_dir,expat)/lib) \ $(if $(SYSBASE), -I$(SYSBASE)/usr/include) \ )" \ $(if $(python3_cflags),CFLAGS='$(python3_cflags)') \ LDFLAGS="$(strip $(LDFLAGS) \ - $(if $(filter YES,$(SYSTEM_OPENSSL)),, -L$(call gb_UnpackedTarball_get_dir,openssl)) \ + $(if $(SYSTEM_OPENSSL),,-L$(call gb_UnpackedTarball_get_dir,openssl)) \ $(if $(filter YES,$(SYSTEM_EXPAT)),, -L$(gb_StaticLibrary_WORKDIR)) \ $(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \ $(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \ diff --git a/external/redland/Module_redland.mk b/external/redland/Module_redland.mk index 431a66da5323..645e4193d827 100644 --- a/external/redland/Module_redland.mk +++ b/external/redland/Module_redland.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,redland)) -ifeq ($(SYSTEM_REDLAND),NO) +ifeq ($(SYSTEM_REDLAND),) $(eval $(call gb_Module_add_targets,redland,\ UnpackedTarball_raptor \ UnpackedTarball_rasqal \ -- cgit