Skip to content

Commit e9aadab

Browse files
committed
refresh a patch
1 parent 3b656da commit e9aadab

File tree

1 file changed

+23
-26
lines changed

1 file changed

+23
-26
lines changed

recipe/patches/0016-cross-compile-darwin.patch

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ By Isuru Fernando.
1111
setup.py | 6 +++---
1212
4 files changed, 17 insertions(+), 6 deletions(-)
1313

14-
diff --git a/Lib/platform.py b/Lib/platform.py
15-
index c272c407c7..c05b9b8ea9 100755
16-
--- a/Lib/platform.py
17-
+++ b/Lib/platform.py
18-
@@ -413,7 +413,12 @@ def win32_ver(release='', version='', csd='', ptype=''):
14+
Index: CPython/Lib/platform.py
15+
===================================================================
16+
--- CPython.orig/Lib/platform.py 2023-12-14 17:49:23.307172000 -0600
17+
+++ CPython/Lib/platform.py 2023-12-14 17:49:31.861760057 -0600
18+
@@ -414,7 +414,12 @@
1919
def _mac_ver_xml():
2020
fn = '/System/Library/CoreServices/SystemVersion.plist'
2121
if not os.path.exists(fn):
@@ -29,11 +29,11 @@ index c272c407c7..c05b9b8ea9 100755
2929

3030
try:
3131
import plistlib
32-
diff --git a/configure b/configure
33-
index 91227f00be..b89d1a380a 100755
34-
--- a/configure
35-
+++ b/configure
36-
@@ -3873,6 +3873,9 @@ if test "$cross_compiling" = yes; then
32+
Index: CPython/configure
33+
===================================================================
34+
--- CPython.orig/configure 2023-12-14 17:49:23.307057000 -0600
35+
+++ CPython/configure 2023-12-14 17:49:31.864960501 -0600
36+
@@ -3887,6 +3887,9 @@
3737
_host_cpu=$host_cpu
3838
esac
3939
;;
@@ -43,7 +43,7 @@ index 91227f00be..b89d1a380a 100755
4343
*-*-cygwin*)
4444
_host_cpu=
4545
;;
46-
@@ -7051,7 +7054,7 @@ esac
46+
@@ -7220,7 +7223,7 @@
4747
fi
4848
fi
4949

@@ -52,11 +52,11 @@ index 91227f00be..b89d1a380a 100755
5252
case "$READELF" in
5353
readelf|:)
5454
as_fn_error $? "readelf for the host is required for cross builds" "$LINENO" 5
55-
diff --git a/configure.ac b/configure.ac
56-
index 77fb609b74..1d9fa9e4ef 100644
57-
--- a/configure.ac
58-
+++ b/configure.ac
59-
@@ -597,6 +597,9 @@ if test "$cross_compiling" = yes; then
55+
Index: CPython/configure.ac
56+
===================================================================
57+
--- CPython.orig/configure.ac 2023-12-14 17:49:23.306975000 -0600
58+
+++ CPython/configure.ac 2023-12-14 17:49:31.866025176 -0600
59+
@@ -605,6 +605,9 @@
6060
_host_cpu=$host_cpu
6161
esac
6262
;;
@@ -66,7 +66,7 @@ index 77fb609b74..1d9fa9e4ef 100644
6666
*-*-cygwin*)
6767
_host_cpu=
6868
;;
69-
@@ -1590,7 +1593,7 @@ then
69+
@@ -1634,7 +1637,7 @@
7070
fi
7171

7272
AC_CHECK_TOOLS([READELF], [readelf], [:])
@@ -75,11 +75,11 @@ index 77fb609b74..1d9fa9e4ef 100644
7575
case "$READELF" in
7676
readelf|:)
7777
AC_MSG_ERROR([readelf for the host is required for cross builds])
78-
diff --git a/setup.py b/setup.py
79-
index 1bb48591c6..79dae21c6d 100644
80-
--- a/setup.py
81-
+++ b/setup.py
82-
@@ -81,7 +81,7 @@ def get_platform():
78+
Index: CPython/setup.py
79+
===================================================================
80+
--- CPython.orig/setup.py 2023-12-14 17:49:23.307112000 -0600
81+
+++ CPython/setup.py 2023-12-14 17:49:31.866430930 -0600
82+
@@ -81,7 +81,7 @@
8383
HOST_PLATFORM = get_platform()
8484
MS_WINDOWS = (HOST_PLATFORM == 'win32')
8585
CYGWIN = (HOST_PLATFORM == 'cygwin')
@@ -88,7 +88,7 @@ index 1bb48591c6..79dae21c6d 100644
8888
AIX = (HOST_PLATFORM.startswith('aix'))
8989
VXWORKS = ('vxworks' in HOST_PLATFORM)
9090
EMSCRIPTEN = HOST_PLATFORM == 'emscripten-wasm32'
91-
@@ -1046,11 +1046,11 @@ def detect_readline_curses(self):
91+
@@ -1049,11 +1049,11 @@
9292
readline_lib = 'readline'
9393
do_readline = self.compiler.find_library_file(self.lib_dirs,
9494
readline_lib)
@@ -102,6 +102,3 @@ index 1bb48591c6..79dae21c6d 100644
102102
ret = run_command("ldd %s > %s" % (do_readline, tmpfile))
103103
else:
104104
ret = 1
105-
--
106-
2.32.1 (Apple Git-133)
107-

0 commit comments

Comments
 (0)