Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3332 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/3332/1 python: honor --disable-openssl On --disable-openssl, the bundled python library will not build its OpenSSL module. Change-Id: I132663c0160f800411f78e49444fe1c5d9ce9ef9 --- M python3/ExternalPackage_python3.mk M python3/ExternalProject_python3.mk 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk index fc16d5a..3dc4dfd 100644 --- a/python3/ExternalPackage_python3.mk +++ b/python3/ExternalPackage_python3.mk @@ -76,7 +76,9 @@ 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 \ - LO_lib/_hashlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ + $(if $(filter-out YES,$(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 \ LO_lib/_json.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/_lsprof.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ @@ -95,7 +97,9 @@ 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 \ - LO_lib/_ssl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ + $(if $(filter-out YES,$(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 \ LO_lib/syslog.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ LO_lib/termios.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \ diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 506551b..b3c10ec 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -13,8 +13,13 @@ $(eval $(call gb_ExternalProject_use_externals,python3,\ expat \ +)) + +ifneq ($(DISABLE_OPENSSL),YES) +$(eval $(call gb_ExternalProject_use_externals,python3,\ openssl \ )) +endif $(eval $(call gb_ExternalProject_register_targets,python3,\ build \ @@ -79,6 +84,7 @@ ) \ 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_EXPAT)),-I$(OUTDIR)/inc/external/expat) \ $(if $(SYSBASE), -I$(SYSBASE)/usr/include) \ )" \ -- To view, visit https://gerrit.libreoffice.org/3332 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I132663c0160f800411f78e49444fe1c5d9ce9ef9 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andres Gomez <ago...@igalia.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice