external/python3/macos-11.patch.0 | 25 ++-----------------------
1 file changed, 2 insertions(+), 23 deletions(-)
New commits:
commit 55b38e9ec099713e31d3cdeb7079748311aaa221
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Mar 17 10:59:31 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Mar 17 11:07:22 2021 +0100
Amend python3/macos-11.patch.0 after upgrade to Python 3.7.10
Change-Id: I27040845f1f526cf1116726f0bcabd8b1a023e68
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 <limits.h>
+
#if defined(__sun) && defined(__SVR4)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
