diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 16:33:18 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:09 +0100 |
| commit | 46648159bfc18cf29196ae8eba5a64decf10c45b (patch) | |
| tree | 22d5e9a0fc52b2e2c321bf9451df0417ac817ba1 /external | |
| parent | 04ff535f72c1fbc5f7dbc8cc54ed9b23f7e130f9 (diff) | |
normalize values of SYSTEM_CLUCENE, SYSTEM_EXPAT, SYSTEM_JPEG
Change-Id: I343dae79b01e1369722c7bbd1ab2c36e2bfa96ac
Diffstat (limited to 'external')
| -rw-r--r-- | external/jpeg/Module_jpeg.mk | 2 | ||||
| -rw-r--r-- | external/python3/ExternalProject_python3.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/external/jpeg/Module_jpeg.mk b/external/jpeg/Module_jpeg.mk index fea0f0bbdff7..0b45932d54f3 100644 --- a/external/jpeg/Module_jpeg.mk +++ b/external/jpeg/Module_jpeg.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,jpeg)) -ifeq ($(SYSTEM_JPEG),NO) +ifeq ($(SYSTEM_JPEG),) $(eval $(call gb_Module_add_targets,jpeg,\ UnpackedTarball_jpeg \ diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 9d620b749b6d..6254cda6453b 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -75,13 +75,13 @@ $(call gb_ExternalProject_get_state_target,python3,build) : CC="$(strip $(CC) \ $(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 $(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 $(SYSTEM_OPENSSL),,-L$(call gb_UnpackedTarball_get_dir,openssl)) \ - $(if $(filter YES,$(SYSTEM_EXPAT)),, -L$(gb_StaticLibrary_WORKDIR)) \ + $(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \ $(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \ $(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \ $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols)) \ |