diff options
| author | Douglas Mencken <dougmencken@gmail.com> | 2014-07-07 14:18:12 -0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-11 14:42:57 +0000 |
| commit | f4beadc6e28b812237e01e6f8f2c4afcf57bb4d5 (patch) | |
| tree | 486875e4a66478db581f37a50fb1a21baef38402 /external/python3 | |
| parent | 96e3a8821d7738ee29dedf9c0c5b0b6f96fae6c7 (diff) | |
avoid -arch for bundled OpenSSL, Python3, and nss/nspr on OSX@PowerPC
this fixes gcc: error: unrecognized command line option '-arch'
The '-arch' option is part of Apple's extensions to GCC, and it is uncompatible
with "vanilla" GCC from FSF. Also, we're not building "universal binaries".
Change-Id: I44e7c72bbb1dd4be5ac9cdbc4f210aaccea513b4
Reviewed-on: https://gerrit.libreoffice.org/10117
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/python3')
| -rw-r--r-- | external/python3/ExternalProject_python3.mk | 3 | ||||
| -rw-r--r-- | external/python3/python-3.3.0-darwin.patch.1 | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 3eda350fbd2b..0d958bccb7e9 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -70,7 +70,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) : OPT="$(gb_COMPILERNOOPTFLAGS) $(gb_DEBUG_CFLAGS)")) \ $(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \ $(if $(filter MACOSX,$(OS)), \ - $(if $(filter INTEL POWERPC,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) --with-universal-archs=32-bit) --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \ + $(if $(filter INTEL,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) --with-universal-archs=32-bit) \ + --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \ --enable-shared \ ) \ CC="$(strip $(CC) \ diff --git a/external/python3/python-3.3.0-darwin.patch.1 b/external/python3/python-3.3.0-darwin.patch.1 index a32b7f588b01..ec4f45f8db74 100644 --- a/external/python3/python-3.3.0-darwin.patch.1 +++ b/external/python3/python-3.3.0-darwin.patch.1 @@ -17,7 +17,7 @@ diff -ru python3.old_/configure python3/configure + UNIVERSAL_ARCH_FLAGS="-arch i386" + ;; + ppc) -+ UNIVERSAL_ARCH_FLAGS="-arch ppc" ++ UNIVERSAL_ARCH_FLAGS="" + ;; + *) + as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5 |