ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Switch OPENSSL config var from negative to positive

Browse Source 
- 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>
This commit is contained in:
Jan-Marek Glogowski
2021-05-05 21:14:30 +02:00
committed by Thorsten Behrens
parent 983c412788
commit 013ddc4f53
11 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/python3/ExternalProject_python3.mk
Vendored
+2 -2
View File
@@ -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}" \
) \