[Libreoffice-commits] core.git: python3/ExternalPackage_python3.mk python3/ExternalProject_python3.mk

[Andres Gomez]

 python3/ExternalPackage_python3.mk |    8 ++++++--
 python3/ExternalProject_python3.mk |    1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 3aa14b5a2f8d815ada281b69e9b8600e759fc5de
Author: Andres Gomez <agomez at igalia.com>
Date:   Wed Apr 10 11:20:42 2013 +0300

    python: honor --disable-openssl
    
    On --disable-openssl, the bundled python library
    will not build its OpenSSL module.
    
    Change-Id: I132663c0160f800411f78e49444fe1c5d9ce9ef9
    Reviewed-on: https://gerrit.libreoffice.org/3332
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

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 @@ $(eval $(call gb_ExternalPackage_add_files,python3,lib/python/lib-dynload,\
 	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 @@ $(eval $(call gb_ExternalPackage_add_files,python3,lib/python/lib-dynload,\
 	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..22a952c 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -79,6 +79,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 		) \
 		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) \
 			)" \