diff options
| author | Tor Lillqvist <tml@iki.fi> | 2020-11-15 13:30:34 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-11-16 00:11:27 +0100 |
| commit | e8bd0d8523eeff99b691f633fa0c8f6d1071e24f (patch) | |
| tree | b35e3d1df638c2255d7106b44c08dfd259fd401d /external | |
| parent | 34be951bde599906d829c8dc676523845c9cb280 (diff) | |
Make python3 build on macOS 11, including for arm64
There is no /usr/lib/libz.dylib any longer in macOS 11.
No idea whether it works (especially on arm64), but that is another
issue.
Change-Id: I92ac0c500388730eca0be4766f07b1af2d2808e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105897
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105906
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/python3/UnpackedTarball_python3.mk | 1 | ||||
| -rw-r--r-- | external/python3/macos-11.patch.0 | 47 |
2 files changed, 48 insertions, 0 deletions
diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index d04868b93a44..fb693e70de7e 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ external/python3/ubsan.patch.0 \ external/python3/python-3.5.tweak.strip.soabi.patch \ external/python3/darwin.patch.0 \ + external/python3/macos-11.patch.0 \ )) ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),) diff --git a/external/python3/macos-11.patch.0 b/external/python3/macos-11.patch.0 new file mode 100644 index 000000000000..11daf84d2710 --- /dev/null +++ b/external/python3/macos-11.patch.0 @@ -0,0 +1,47 @@ +-*- Mode: diff -*- +--- configure ++++ configure +@@ -3374,7 +3374,7 @@ + # has no effect, don't bother defining them + Darwin/[6789].*) + define_xopen_source=no;; +- Darwin/1[0-9].*) ++ Darwin/[12][0-9].*) + define_xopen_source=no;; + # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but + # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined +@@ -9372,6 +9275,9 @@ + esac + else + case `/usr/bin/arch` in ++ arm64) ++ MACOSX_DEFAULT_ARCH="arm64" ++ ;; + i386) + MACOSX_DEFAULT_ARCH="x86_64" + ;; +--- Mac/Tools/pythonw.c ++++ Mac/Tools/pythonw.c +@@ -121,6 +121,8 @@ + cpu_types[0] = CPU_TYPE_POWERPC; + #elif defined(__i386__) + cpu_types[0] = CPU_TYPE_X86; ++#elif defined(__arm64__) ++ cpu_types[0] = CPU_TYPE_ARM64; + #else + # error "Unknown CPU" + #endif +--- setup.py ++++ setup.py +@@ -670,7 +670,10 @@ + add_dir_to_list(self.compiler.include_dirs, + sysconfig.get_config_var("INCLUDEDIR")) + +- system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib'] ++ if host_platform == 'darwin': ++ system_lib_dirs = ['/usr/lib', macosx_sdk_root()+'/usr/lib'] ++ else: ++ system_lib_dirs = ['/lib64', '/usr/lib64', '/lib', '/usr/lib'] + system_include_dirs = ['/usr/include'] + # lib_dirs and inc_dirs are used to search for files; + # if a file is found in one of those directories, it can |