diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 462004d1d1e3..54d7381f40dd 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -101,9 +101,6 @@ $(call gb_ExternalProject_get_state_target,python3,build) : --prefix=/python-inst \ --with-system-expat \ $(if $(filter MACOSX,$(OS)), \ - $(if $(filter INTEL,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) \ - --with-universal-archs=intel \ - ) \ --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \ --enable-shared \ ) \ diff --git a/external/python3/python-3.3.0-darwin.patch.1 b/external/python3/python-3.3.0-darwin.patch.1 index 67f27c78d776..5cc2671d6078 100644 --- a/external/python3/python-3.3.0-darwin.patch.1 +++ b/external/python3/python-3.3.0-darwin.patch.1 @@ -2,31 +2,6 @@ LO needs to build both against MacOSX SDK and not produce universal binaries. -diff -ru python3.orig/configure python3/configure ---- python3.orig/configure 2015-07-26 17:36:11.808497783 +0200 -+++ python3/configure 2015-07-26 17:38:49.016508337 +0200 -@@ -7385,7 +7385,20 @@ - then - case "$UNIVERSAL_ARCHS" in - 32-bit) -- UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386" -+ # LO does not use Universal Binaries (but the only way to set a SDK -+ # here implies that, so de-universalize here...) -+ case `/usr/bin/arch` in -+ i386) -+ UNIVERSAL_ARCH_FLAGS="-arch i386" -+ ;; -+ ppc) -+ UNIVERSAL_ARCH_FLAGS="" -+ ;; -+ *) -+ as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5 -+ ;; -+ esac -+ - LIPO_32BIT_FLAGS="" - ARCH_RUN_32BIT="" - ;; diff -ru python3.orig/Mac/Makefile.in python3/Mac/Makefile.in --- python3.orig/Mac/Makefile.in 2015-07-05 18:50:07.000000000 +0200 +++ python3/Mac/Makefile.in 2015-07-26 17:40:14.860514100 +0200