From b322efcc63ec078509ac3877c5ab6009a69d0005 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Wed, 17 Mar 2021 10:59:31 +0100 Subject: Amend python3/macos-11.patch.0 after upgrade to Python 3.7.10 Change-Id: I27040845f1f526cf1116726f0bcabd8b1a023e68 --- external/python3/macos-11.patch.0 | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/external/python3/macos-11.patch.0 b/external/python3/macos-11.patch.0 index 3a3da0e99bac..42b74f4b2f50 100644 --- a/external/python3/macos-11.patch.0 +++ b/external/python3/macos-11.patch.0 @@ -1,25 +1,4 @@ -*- 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 @@ @@ -36,7 +15,7 @@ @@ -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'] @@ -62,7 +41,7 @@ @@ -31,6 +31,8 @@ # define SYS_getdents64 __NR_getdents64 #endif - + +#include + #if defined(__sun) && defined(__SVR4) -- cgit