diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 16:21:04 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:08 +0100 |
| commit | 04ff535f72c1fbc5f7dbc8cc54ed9b23f7e130f9 (patch) | |
| tree | 52cb40ab9b0e01c26e6b94f1039bc5d36a578f59 /external | |
| parent | 23647595d77b85b5dac0d5762987a3ba2533ffd9 (diff) | |
normalize values of SYSTEM_ZLIB, SYSTEM_DICTS, SYSTEM_FONTCONFIG
Change-Id: I7530cb9d0797df5fc86695b0379cc44c159d2ab5
Diffstat (limited to 'external')
| -rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 4 | ||||
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 4 | ||||
| -rw-r--r-- | external/nss/nss.patch | 2 | ||||
| -rw-r--r-- | external/zlib/Module_zlib.mk | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index 90420f63dde3..d055db06429c 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -36,8 +36,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : $(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \ pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \ pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \ - COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \ - ZLIB3RDLIB="$(if $(filter YES,$(SYSTEM_ZLIB)),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \ + COMPRESS=$(if $(SYSTEM_ZLIB),compress,z_compress) \ + ZLIB3RDLIB="$(if $(SYSTEM_ZLIB),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \ png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \ png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \ $(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \ diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 171ea5981c83..432423a2a3e4 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -32,7 +32,7 @@ $(eval $(call gb_ExternalProject_register_targets,liborcus,\ #$(if $(filter MSC,$(COM)),CPPFLAGS+="-DBOOST_ALL_NO_LIB") CXXFLAGS+="$(BOOST_CXXFLAGS)) liborcus_LIBS= -ifeq ($(SYSTEM_ZLIB),YES) +ifneq ($(SYSTEM_ZLIB),) liborcus_LIBS+=-lz endif ifeq ($(SYSTEM_BOOST),YES) @@ -48,7 +48,7 @@ liborcus_CPPCLAGS=$(CPPFLAGS) ifeq ($(COM),MSC) liborcus_CPPFLAGS+=-DBOOST_ALL_NO_LIB endif -ifeq ($(SYSTEM_ZLIB),NO) +ifeq ($(SYSTEM_ZLIB),) liborcus_CPPFLAGS+=$(ZLIB_CFLAGS) endif # patched boost needs to find config_global.h diff --git a/external/nss/nss.patch b/external/nss/nss.patch index 37caae09aeb7..95a00491c512 100644 --- a/external/nss/nss.patch +++ b/external/nss/nss.patch @@ -48,7 +48,7 @@ endif endif -+ifeq ($(SYSTEM_ZLIB),YES) ++ifneq ($(SYSTEM_ZLIB),) +# Currently (3.12.4) only the tools modutil and signtool are linked with libz +# If USE_SYSTEM_ZLIB is not set then the tools link statically libzlib.a which +# is also build in nss. diff --git a/external/zlib/Module_zlib.mk b/external/zlib/Module_zlib.mk index 7241df0d63e9..8f71c506d476 100644 --- a/external/zlib/Module_zlib.mk +++ b/external/zlib/Module_zlib.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,zlib)) -ifeq ($(SYSTEM_ZLIB),NO) +ifeq ($(SYSTEM_ZLIB),) $(eval $(call gb_Module_add_targets,zlib,\ StaticLibrary_zlib \ |