diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-31 18:55:53 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-10-17 03:54:05 +0000 |
| commit | bf6d1f77420dcc9ece4d9f4eae1e37b427d85c6a (patch) | |
| tree | 8147c75b761cc8d0546d34813ef1dc90256aa4f8 /python3 | |
| parent | ce40605a8f906ebb4d800798d1e0c17ded4c053a (diff) | |
Normalize DISABLE_OPENSSL to USE TRUE/<nothing>
Change-Id: I84dd99f42e032315fbf31332dfb62eb3ef4aa4c0
Reviewed-on: https://gerrit.libreoffice.org/5724
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'python3')
| -rw-r--r-- | python3/ExternalPackage_python3.mk | 4 | ||||
| -rw-r--r-- | python3/ExternalProject_python3.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk index a661ff7c1164..4fefb89f8e80 100644 --- a/python3/ExternalPackage_python3.mk +++ b/python3/ExternalPackage_python3.mk @@ -78,7 +78,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor LO_lib/_elementtree.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/fcntl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/grp.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ - $(if $(filter-out YES,$(DISABLE_OPENSSL)), \ + $(if $(DISABLE_OPENSSL),, \ LO_lib/_hashlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ ) \ LO_lib/_heapq.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ @@ -99,7 +99,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor LO_lib/select.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/_socket.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/spwd.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ - $(if $(filter-out YES,$(DISABLE_OPENSSL)), \ + $(if $(DISABLE_OPENSSL),, \ LO_lib/_ssl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ ) \ LO_lib/_struct.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 8e7769ba37f6..70063f0f52eb 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -73,8 +73,8 @@ $(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 $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),-I$(call gb_UnpackedTarball_get_dir,openssl)/include) \ + $(if $(filter NO,$(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) \ )" \ |