ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

fdo#74825: fix missing lcms2/libxslt/curl in installation sets

Browse Source 
The assumption that all configure variables had been normalized to
TRUE/<empty> turned out not to hold; convert a bit more in that
direction.

(regression from 4af38b099c)

Change-Id: I2127c515e8a833a07c9b26ed9d693ce5a1853fe4
This commit is contained in:
Michael Stahl
2014-02-12 09:53:08 +01:00
parent b62f5c2a22
commit e3abec3f07
15 changed files with 68 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/python3/ExternalProject_python3.mk
Vendored
+2 -2
View File
@@ -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 \