diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-12-28 11:19:06 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-31 20:13:20 +0000 |
| commit | 9ddba6644024254a348c3569835df6ffae8c985a (patch) | |
| tree | 7e48f8fdce73cf7a7766623b59e386ea684973b5 /python3/ExternalProject_python3.mk | |
| parent | b4b6c459830ba6a070a813a533530feff3964ab0 (diff) | |
convert openssl to gbuild and add to tail_build
Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3
Reviewed-on: https://gerrit.libreoffice.org/1495
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'python3/ExternalProject_python3.mk')
| -rw-r--r-- | python3/ExternalProject_python3.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index dc6999d2481c..e2ea53a665eb 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -11,7 +11,10 @@ $(eval $(call gb_ExternalProject_ExternalProject,python3)) $(eval $(call gb_ExternalProject_use_unpacked,python3,python3)) -$(eval $(call gb_ExternalProject_use_external,python3,expat)) +$(eval $(call gb_ExternalProject_use_externals,python3,\ + expat \ + openssl \ +)) $(eval $(call gb_ExternalProject_register_targets,python3,\ build \ @@ -75,8 +78,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) : --enable-shared \ ) \ CC="$(strip $(CC) \ - $(if $(filter YES,$(SYSTEM_OPENSSL)),, -I$(OUTDIR)/inc/external) \ - $(if $(filter YES,$(SYSTEM_EXPAT)),, -I$(OUTDIR)/inc/external/expat) \ + $(if $(filter NO,$(SYSTEM_OPENSSL)),-I$(call gb_UnpackedTarball_get_dir,openssl)/include) \ + $(if $(filter NO,$(SYSTEM_EXPAT)),-I$(OUTDIR)/inc/external/expat) \ $(if $(SYSBASE), -I$(SYSBASE)/usr/include) \ )" \ $(if $(python3_cflags),CFLAGS='$(python3_cflags)') \ |