diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-23 10:04:29 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-05-05 21:14:30 +0200 |
| commit | 013ddc4f5307df512767ca23b3922540b2b36d52 (patch) | |
| tree | 2bff87fd1dcdcd8dc99358ba1ddaee606dd38b08 /external/python3 | |
| parent | 983c41278899674028040c70c6e6415574b701f1 (diff) | |
Switch OPENSSL config var from negative to positive
- align with most of the rest of config_host
- rename DISABLE_OPENSSL to ENABLE_OPENSSL
- make this configurable
Change-Id: Ic3b41fcdda38db66134939f12265e0da24833d60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114564
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'external/python3')
| -rw-r--r-- | external/python3/ExternalPackage_python3.mk | 4 | ||||
| -rw-r--r-- | external/python3/ExternalProject_python3.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk index a06d919e01ce..faddf06fc36a 100644 --- a/external/python3/ExternalPackage_python3.mk +++ b/external/python3/ExternalPackage_python3.mk @@ -79,7 +79,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor LO_lib/_elementtree.$(python3_EXTENSION_MODULE_SUFFIX).so \ LO_lib/fcntl.$(python3_EXTENSION_MODULE_SUFFIX).so \ LO_lib/grp.$(python3_EXTENSION_MODULE_SUFFIX).so \ - $(if $(DISABLE_OPENSSL),, \ + $(if $(ENABLE_OPENSSL), \ LO_lib/_hashlib.$(python3_EXTENSION_MODULE_SUFFIX).so \ ) \ LO_lib/_heapq.$(python3_EXTENSION_MODULE_SUFFIX).so \ @@ -107,7 +107,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor LO_lib/_sha512.$(python3_EXTENSION_MODULE_SUFFIX).so \ LO_lib/_socket.$(python3_EXTENSION_MODULE_SUFFIX).so \ LO_lib/spwd.$(python3_EXTENSION_MODULE_SUFFIX).so \ - $(if $(DISABLE_OPENSSL),, \ + $(if $(ENABLE_OPENSSL), \ LO_lib/_ssl.$(python3_EXTENSION_MODULE_SUFFIX).so \ ) \ LO_lib/_statistics.$(python3_EXTENSION_MODULE_SUFFIX).so \ diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 680da9352638..7ff7040e03bd 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -100,9 +100,9 @@ $(call gb_ExternalProject_get_state_target,python3,build) : --enable-shared \ $(if $(filter 1090 101000 101100 101200,$(MAC_OS_X_VERSION_MIN_REQUIRED)),ac_cv_func_utimensat=no) \ ) \ - $(if $(SYSTEM_OPENSSL)$(DISABLE_OPENSSL),,\ + $(if $(ENABLE_OPENSSL),$(if $(SYSTEM_OPENSSL),,\ --with-openssl=$(call gb_UnpackedTarball_get_dir,openssl) \ - ) \ + ) ) \ $(if $(filter LINUX,$(OS)), \ PKG_CONFIG_LIBDIR="$(call gb_UnpackedTarball_get_dir,libffi)/$(HOST_PLATFORM)$${PKG_CONFIG_LIBDIR:+:$$PKG_CONFIG_LIBDIR}" \ ) \ |