python3: udpate to 3.10.1

Refreshed patches.

(From OE-Core rev: b82ea986a492791716c3da07a7d728edd17654c9)

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Oleksandr Kravchuk
2021-12-09 21:33:16 +01:00
committed by Richard Purdie
parent 9fc8c38658
commit 2faf8fe584
24 changed files with 109 additions and 108 deletions

View File

@@ -1,4 +1,4 @@
From 039c53dd5baddec3359a05be0bff46a3b32bbb84 Mon Sep 17 00:00:00 2001 From 80f872e4573f542d33f91514538755557d566f79 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 25 Jan 2019 19:04:13 +0100 Date: Fri, 25 Jan 2019 19:04:13 +0100
Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoid host Subject: [PATCH] Do not add /usr/lib/termcap to linker flags to avoid host
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 1 deletion(-) 1 file changed, 1 deletion(-)
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
index 20d7f35..ab18ff0 100644 index 43e807f..11b5cf5 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -957,7 +957,6 @@ class PyBuildExt(build_ext): @@ -1149,7 +1149,6 @@ class PyBuildExt(build_ext):
'termcap'): 'termcap'):
readline_libs.append('termcap') readline_libs.append('termcap')
self.add(Extension('readline', ['readline.c'], self.add(Extension('readline', ['readline.c'],

View File

@@ -1,4 +1,4 @@
From 148861fa16f2aaacd518770f337ea54b5182f981 Mon Sep 17 00:00:00 2001 From 2406432449784243b7590009d42bd0e871253b2e Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 29 Jan 2019 15:03:01 +0100 Date: Tue, 29 Jan 2019 15:03:01 +0100
Subject: [PATCH] Do not use the shell version of python-config that was Subject: [PATCH] Do not use the shell version of python-config that was
@@ -9,15 +9,16 @@ outputs directories correctly.
Upstream-Status: Inappropriate [oe-specific] Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
--- ---
Makefile.pre.in | 9 +++------ Makefile.pre.in | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-) 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in diff --git a/Makefile.pre.in b/Makefile.pre.in
index 2d2e11f..cc19942 100644 index ee85f35..f0aedb7 100644
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -1431,12 +1431,9 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh @@ -1640,12 +1640,9 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py
@ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} @ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR}
LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config

View File

@@ -1,4 +1,4 @@
From cebb772d718a8f798ed5ae311a6e3e61534bea95 Mon Sep 17 00:00:00 2001 From df1a5e4bc6c8523eaa33daa2a90707fe6c6bddb6 Mon Sep 17 00:00:00 2001
From: Jeremy Puhlman <jpuhlman@mvista.com> From: Jeremy Puhlman <jpuhlman@mvista.com>
Date: Wed, 4 Mar 2020 00:06:42 +0000 Date: Wed, 4 Mar 2020 00:06:42 +0000
Subject: [PATCH] Don't search system for headers/libraries Subject: [PATCH] Don't search system for headers/libraries
@@ -11,10 +11,10 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
index 95e3e11..32a4d42 100644 index c190002..5ef368d 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -840,8 +840,8 @@ class PyBuildExt(build_ext): @@ -854,8 +854,8 @@ class PyBuildExt(build_ext):
add_dir_to_list(self.compiler.include_dirs, add_dir_to_list(self.compiler.include_dirs,
sysconfig.get_config_var("INCLUDEDIR")) sysconfig.get_config_var("INCLUDEDIR"))

View File

@@ -1,4 +1,4 @@
From d8521ee967937184eadc59fff1a30740ad181a98 Mon Sep 17 00:00:00 2001 From 86061629f4a179e740a17e53dd2c98ab47af2fe2 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de> From: Alexander Kanavin <alex@linutronix.de>
Date: Thu, 16 Sep 2021 16:35:37 +0200 Date: Thu, 16 Sep 2021 16:35:37 +0200
Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O
@@ -24,12 +24,13 @@ So let's treat both channels the same.
Upstream-Status: Submitted [https://github.com/python/cpython/pull/28388] Upstream-Status: Submitted [https://github.com/python/cpython/pull/28388]
Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
--- ---
Lib/pty.py | 5 ++++- Lib/pty.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-) 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Lib/pty.py b/Lib/pty.py diff --git a/Lib/pty.py b/Lib/pty.py
index 8d8ce40df5..35439c6b96 100644 index 8d8ce40..35439c6 100644
--- a/Lib/pty.py --- a/Lib/pty.py
+++ b/Lib/pty.py +++ b/Lib/pty.py
@@ -154,7 +154,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read): @@ -154,7 +154,10 @@ def _copy(master_fd, master_read=_read, stdin_read=_read):
@@ -44,6 +45,3 @@ index 8d8ce40df5..35439c6b96 100644
if not data: if not data:
fds.remove(STDIN_FILENO) fds.remove(STDIN_FILENO)
else: else:
--
2.20.1

View File

@@ -1,4 +1,4 @@
From aceaa16e25a8ab6a00f906c340843999635c8e23 Mon Sep 17 00:00:00 2001 From 2d4bde19e0df7244e1cd17c4f4a255d488cb3e56 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de> From: Alexander Kanavin <alex@linutronix.de>
Date: Fri, 10 Sep 2021 12:28:31 +0200 Date: Fri, 10 Sep 2021 12:28:31 +0200
Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration
@@ -9,12 +9,13 @@ native python.
Upstream-Status: Inappropriate [oe-core cross builds] Upstream-Status: Inappropriate [oe-core cross builds]
Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
--- ---
Lib/sysconfig.py | 5 +++++ Lib/sysconfig.py | 5 +++++
1 file changed, 5 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index 95b48f6..84f6427 100644 index e64bcdc..40c6b3e 100644
--- a/Lib/sysconfig.py --- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py +++ b/Lib/sysconfig.py
@@ -613,6 +613,11 @@ def get_config_vars(*args): @@ -613,6 +613,11 @@ def get_config_vars(*args):
@@ -29,6 +30,3 @@ index 95b48f6..84f6427 100644
# For backward compatibility, see issue19555 # For backward compatibility, see issue19555
SO = _CONFIG_VARS.get('EXT_SUFFIX') SO = _CONFIG_VARS.get('EXT_SUFFIX')
if SO is not None: if SO is not None:
--
2.20.1

View File

@@ -1,4 +1,4 @@
From c501e121a872cbcef8ffe626c1de173a125be9f8 Mon Sep 17 00:00:00 2001 From c960837b8fd83074bab5148236f3d0595468cea4 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 16 Jan 2020 12:34:20 +0100 Date: Thu, 16 Jan 2020 12:34:20 +0100
Subject: [PATCH] Makefile: do not compile .pyc in parallel Subject: [PATCH] Makefile: do not compile .pyc in parallel
@@ -17,15 +17,16 @@ https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20211130-yr_o1a8d/pa
Upstream-Status: Inappropriate [see issues above] Upstream-Status: Inappropriate [see issues above]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
--- ---
Makefile.pre.in | 12 ++++++------ Makefile.pre.in | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-) 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in diff --git a/Makefile.pre.in b/Makefile.pre.in
index 1241112..5dfdf44 100644 index edd70d4..5e13ba2 100644
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -1457,30 +1457,30 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c @@ -1601,30 +1601,30 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
fi fi
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \

View File

@@ -1,19 +1,20 @@
From cf6a9100902484e4d028ee88742dd2487b014a98 Mon Sep 17 00:00:00 2001 From 9f85089cc3a21d5ff235bb37c6c9758f2b70497d Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 30 Jan 2019 12:41:04 +0100 Date: Wed, 30 Jan 2019 12:41:04 +0100
Subject: [PATCH] Makefile.pre: use qemu wrapper when gathering profile data Subject: [PATCH] Makefile.pre: use qemu wrapper when gathering profile data
Upstream-Status: Inappropriate [oe-core specific] Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
--- ---
Makefile.pre.in | 3 +-- Makefile.pre.in | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-) 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in diff --git a/Makefile.pre.in b/Makefile.pre.in
index a3a02a7..d5503dd 100644 index f0aedb7..edd70d4 100644
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -507,8 +507,7 @@ build_all_generate_profile: @@ -519,8 +519,7 @@ build_all_generate_profile:
$(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS_NODIST) $(PGO_PROF_GEN_FLAG)" LDFLAGS_NODIST="$(LDFLAGS_NODIST) $(PGO_PROF_GEN_FLAG)" LIBS="$(LIBS)" $(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="$(CFLAGS_NODIST) $(PGO_PROF_GEN_FLAG)" LDFLAGS_NODIST="$(LDFLAGS_NODIST) $(PGO_PROF_GEN_FLAG)" LIBS="$(LIBS)"
run_profile_task: run_profile_task:

View File

@@ -1,9 +1,8 @@
From 0b25b66d4f54bd74615c9ff10f3fae8f0d1c548d Mon Sep 17 00:00:00 2001 From 7171aeee22a0b7ab57cdf3d1ae15530549f8f92a Mon Sep 17 00:00:00 2001
From: Yi Fan Yu <yifan.yu@windriver.com> From: Yi Fan Yu <yifan.yu@windriver.com>
Date: Thu, 1 Apr 2021 13:08:37 -0700 Date: Thu, 1 Apr 2021 13:08:37 -0700
Subject: [PATCH] Skip failing tests due to load variability on YP AB Subject: [PATCH] Skip failing tests due to load variability on YP AB
Skip these tests until AB-INT is solved. Skip these tests until AB-INT is solved.
[YOCTO #14296] [YOCTO #14296]
@@ -11,16 +10,17 @@ Skip these tests until AB-INT is solved.
Upstream-Status: Inappropriate [OE-Specific] Upstream-Status: Inappropriate [OE-Specific]
Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
--- ---
Lib/test/_test_multiprocessing.py | 2 ++ Lib/test/_test_multiprocessing.py | 2 ++
Lib/test/test_time.py | 1 + Lib/test/test_time.py | 1 +
2 files changed, 3 insertions(+) 2 files changed, 3 insertions(+)
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index fd3b430..cda29f6 100644 index 3bc5b8f..a6e106d 100644
--- a/Lib/test/_test_multiprocessing.py --- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py
@@ -568,6 +568,7 @@ def test_close(self): @@ -568,6 +568,7 @@ class _TestProcess(BaseTestCase):
close_queue(q) close_queue(q)
@@ -28,7 +28,7 @@ index fd3b430..cda29f6 100644
def test_many_processes(self): def test_many_processes(self):
if self.TYPE == 'threads': if self.TYPE == 'threads':
self.skipTest('test not appropriate for {}'.format(self.TYPE)) self.skipTest('test not appropriate for {}'.format(self.TYPE))
@@ -4715,6 +4716,7 @@ def signal_and_sleep(cls, sem, period): @@ -4817,6 +4818,7 @@ class TestWait(unittest.TestCase):
sem.release() sem.release()
time.sleep(period) time.sleep(period)
@@ -37,10 +37,10 @@ index fd3b430..cda29f6 100644
from multiprocessing.connection import wait from multiprocessing.connection import wait
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index 3258298..adcf407 100644 index 875615a..aebaa8c 100644
--- a/Lib/test/test_time.py --- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py +++ b/Lib/test/test_time.py
@@ -474,6 +474,7 @@ def test_monotonic(self): @@ -474,6 +474,7 @@ class TimeTestCase(unittest.TestCase):
def test_perf_counter(self): def test_perf_counter(self):
time.perf_counter() time.perf_counter()
@@ -48,6 +48,3 @@ index 3258298..adcf407 100644
def test_process_time(self): def test_process_time(self):
# process_time() should not include time spend during a sleep # process_time() should not include time spend during a sleep
start = time.process_time() start = time.process_time()
--
2.17.1

View File

@@ -1,4 +1,4 @@
From 9f63e83b1cec872917647b11155edaffe399d103 Mon Sep 17 00:00:00 2001 From d7217b79a4e125d4fcc1087743171b94d91d1121 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com> From: Inada Naoki <songofacandy@gmail.com>
Date: Sat, 14 Jul 2018 00:46:11 +0900 Date: Sat, 14 Jul 2018 00:46:11 +0900
Subject: [PATCH] Use FLAG_REF always for interned strings Subject: [PATCH] Use FLAG_REF always for interned strings
@@ -11,7 +11,7 @@ Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
1 file changed, 7 insertions(+), 2 deletions(-) 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Python/marshal.c b/Python/marshal.c diff --git a/Python/marshal.c b/Python/marshal.c
index c4538bd..2437160 100644 index 4125240..341c9aa 100644
--- a/Python/marshal.c --- a/Python/marshal.c
+++ b/Python/marshal.c +++ b/Python/marshal.c
@@ -298,9 +298,14 @@ w_ref(PyObject *v, char *flag, WFILE *p) @@ -298,9 +298,14 @@ w_ref(PyObject *v, char *flag, WFILE *p)

View File

@@ -1,7 +1,8 @@
From 1ad771d86728ee2ed30e202e9768d8d825f96467 Mon Sep 17 00:00:00 2001 From 7cfa712eecf02edaefaf0e51f3c8a31933b88db1 Mon Sep 17 00:00:00 2001
From: Matthias Schoepfer <matthias.schoepfer@ithinx.io> From: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
Date: Fri, 31 May 2019 15:34:34 +0200 Date: Fri, 31 May 2019 15:34:34 +0200
Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft
float float
When (cross) compiling for softfloat mips, __mips_hard_float will not be When (cross) compiling for softfloat mips, __mips_hard_float will not be
@@ -13,18 +14,18 @@ to do this in a more autoconf/autotools manner.
Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196] Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196]
Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io> Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
%% original patch: 0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
--- ---
configure.ac | 175 +++++++-------------------------------------------- configure.ac | 175 +++++++--------------------------------------------
1 file changed, 21 insertions(+), 154 deletions(-) 1 file changed, 21 insertions(+), 154 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index ede710e..bc81b0b 100644 index 299786b..d0db062 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -710,160 +710,27 @@ fi @@ -718,160 +718,27 @@ then
MULTIARCH=$($CC --print-multiarch 2>/dev/null) fi
AC_SUBST(MULTIARCH)
-AC_MSG_CHECKING([for the platform triplet based on compiler characteristics]) -AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])
-cat >> conftest.c <<EOF -cat >> conftest.c <<EOF
@@ -202,8 +203,5 @@ index ede710e..bc81b0b 100644
+ ;; + ;;
+esac +esac
if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then if test x$PLATFORM_TRIPLET != xdarwin; then
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then MULTIARCH=$($CC --print-multiarch 2>/dev/null)
--
2.24.1

View File

@@ -1,4 +1,4 @@
From 3a98c2eab187289dc8c55e36738c2c0f4216d906 Mon Sep 17 00:00:00 2001 From 8a91a3047222ac533c2ca00b6d27cf6f992e6b11 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 31 Jan 2019 16:46:30 +0100 Date: Thu, 31 Jan 2019 16:46:30 +0100
Subject: [PATCH] distutils/sysconfig: append Subject: [PATCH] distutils/sysconfig: append
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index a78c0b1..f5c5efe 100644 index 40c6b3e..ac94cc7 100644
--- a/Lib/sysconfig.py --- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py +++ b/Lib/sysconfig.py
@@ -474,6 +474,8 @@ def _init_posix(vars): @@ -474,6 +474,8 @@ def _init_posix(vars):

View File

@@ -1,4 +1,4 @@
From 5f9eea2c4f8716830f6c8855a3e10872119fae32 Mon Sep 17 00:00:00 2001 From 9f68a27eb34394a00f1011c06900c609f15fb15c Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com> From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 22 Oct 2018 15:19:51 +0800 Date: Mon, 22 Oct 2018 15:19:51 +0800
Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler
@@ -27,10 +27,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
1 file changed, 10 insertions(+), 9 deletions(-) 1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index d60f052..e491e24 100644 index 0c06914..299786b 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -54,6 +54,7 @@ AC_CONFIG_HEADER(pyconfig.h) @@ -61,6 +61,7 @@ AC_CONFIG_HEADER(pyconfig.h)
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_SUBST(build) AC_SUBST(build)
AC_SUBST(host) AC_SUBST(host)
@@ -38,7 +38,7 @@ index d60f052..e491e24 100644
# pybuilddir.txt will be created by --generate-posix-vars in the Makefile # pybuilddir.txt will be created by --generate-posix-vars in the Makefile
rm -f pybuilddir.txt rm -f pybuilddir.txt
@@ -689,7 +690,7 @@ AC_MSG_RESULT($with_cxx_main) @@ -688,7 +689,7 @@ AC_MSG_RESULT($with_cxx_main)
preset_cxx="$CXX" preset_cxx="$CXX"
if test -z "$CXX" if test -z "$CXX"
then then
@@ -47,7 +47,7 @@ index d60f052..e491e24 100644
gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;;
cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;;
clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;; clang|*/clang) AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;;
@@ -975,7 +976,7 @@ rmdir CaseSensitiveTestDir @@ -976,7 +977,7 @@ rmdir CaseSensitiveTestDir
case $ac_sys_system in case $ac_sys_system in
hp*|HP*) hp*|HP*)
@@ -56,7 +56,7 @@ index d60f052..e491e24 100644
cc|*/cc) CC="$CC -Ae";; cc|*/cc) CC="$CC -Ae";;
esac;; esac;;
esac esac
@@ -1366,7 +1367,7 @@ else @@ -1374,7 +1375,7 @@ else
fi], fi],
[AC_MSG_RESULT(no)]) [AC_MSG_RESULT(no)])
if test "$Py_LTO" = 'true' ; then if test "$Py_LTO" = 'true' ; then
@@ -65,7 +65,7 @@ index d60f052..e491e24 100644
*clang*) *clang*)
AC_SUBST(LLVM_AR) AC_SUBST(LLVM_AR)
AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path}) AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path})
@@ -1456,7 +1457,7 @@ then @@ -1467,7 +1468,7 @@ then
fi fi
fi fi
LLVM_PROF_ERR=no LLVM_PROF_ERR=no
@@ -74,7 +74,7 @@ index d60f052..e491e24 100644
*clang*) *clang*)
# Any changes made here should be reflected in the GCC+Darwin case below # Any changes made here should be reflected in the GCC+Darwin case below
PGO_PROF_GEN_FLAG="-fprofile-instr-generate" PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
@@ -1517,7 +1518,7 @@ esac @@ -1528,7 +1529,7 @@ esac
# compiler and platform. BASECFLAGS tweaks need to be made even if the # compiler and platform. BASECFLAGS tweaks need to be made even if the
# user set OPT. # user set OPT.
@@ -83,7 +83,7 @@ index d60f052..e491e24 100644
*clang*) *clang*)
cc_is_clang=1 cc_is_clang=1
;; ;;
@@ -1653,7 +1654,7 @@ yes) @@ -1664,7 +1665,7 @@ yes)
# ICC doesn't recognize the option, but only emits a warning # ICC doesn't recognize the option, but only emits a warning
## XXX does it emit an unused result warning and can it be disabled? ## XXX does it emit an unused result warning and can it be disabled?
@@ -92,7 +92,7 @@ index d60f052..e491e24 100644
*icc*) *icc*)
ac_cv_disable_unused_result_warning=no ac_cv_disable_unused_result_warning=no
;; ;;
@@ -1993,7 +1994,7 @@ yes) @@ -2018,7 +2019,7 @@ yes)
;; ;;
esac esac
@@ -101,7 +101,7 @@ index d60f052..e491e24 100644
*icc*) *icc*)
# ICC needs -fp-model strict or floats behave badly # ICC needs -fp-model strict or floats behave badly
CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict" CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict"
@@ -2765,7 +2766,7 @@ then @@ -2836,7 +2837,7 @@ then
then then
LINKFORSHARED="-Wl,--export-dynamic" LINKFORSHARED="-Wl,--export-dynamic"
fi;; fi;;
@@ -110,7 +110,7 @@ index d60f052..e491e24 100644
*gcc*) *gcc*)
if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
then then
@@ -5507,7 +5508,7 @@ if test "$have_gcc_asm_for_x87" = yes; then @@ -5622,7 +5623,7 @@ if test "$have_gcc_asm_for_x87" = yes; then
# Some versions of gcc miscompile inline asm: # Some versions of gcc miscompile inline asm:
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491
# http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html

View File

@@ -1,4 +1,4 @@
From 93346d1a2f5d4f7085391bc7c1230d85ebe00606 Mon Sep 17 00:00:00 2001 From 9162460d81ccc725fb04a14b27d0bf4afcfb69c9 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de> From: Alexander Kanavin <alex@linutronix.de>
Date: Sun, 12 Sep 2021 21:44:36 +0200 Date: Sun, 12 Sep 2021 21:44:36 +0200
Subject: [PATCH] sysconfig.py: use platlibdir also for purelib Subject: [PATCH] sysconfig.py: use platlibdir also for purelib
@@ -8,12 +8,13 @@ is not correct.
Upstream-Status: Inappropriate [oe-core specific] Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
--- ---
Lib/sysconfig.py | 2 +- Lib/sysconfig.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index b70d392..c418acd 100644 index daf9f00..e64bcdc 100644
--- a/Lib/sysconfig.py --- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py +++ b/Lib/sysconfig.py
@@ -27,7 +27,7 @@ _INSTALL_SCHEMES = { @@ -27,7 +27,7 @@ _INSTALL_SCHEMES = {
@@ -25,6 +26,3 @@ index b70d392..c418acd 100644
'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages', 'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages',
'include': 'include':
'{installed_base}/include/python{py_version_short}{abiflags}', '{installed_base}/include/python{py_version_short}{abiflags}',
--
2.20.1

View File

@@ -1,4 +1,4 @@
From 7a2bddfa437be633bb6945d0e6b7d6f27da870ad Mon Sep 17 00:00:00 2001 From 13aa6449c47980c7270dad2527c3911517bf34e6 Mon Sep 17 00:00:00 2001
From: Tim Orling <timothy.t.orling@intel.com> From: Tim Orling <timothy.t.orling@intel.com>
Date: Fri, 18 Jun 2021 11:56:50 -0700 Date: Fri, 18 Jun 2021 11:56:50 -0700
Subject: [PATCH] test_ctypes.test_find: skip without tools-sdk Subject: [PATCH] test_ctypes.test_find: skip without tools-sdk
@@ -10,15 +10,16 @@ easiest way to dynamically check for that is looking for
Upstream-Status: Inappropriate [oe-specific] Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Tim Orling <timothy.t.orlign@intel.com> Signed-off-by: Tim Orling <timothy.t.orlign@intel.com>
--- ---
Lib/ctypes/test/test_find.py | 2 ++ Lib/ctypes/test/test_find.py | 2 ++
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/Lib/ctypes/test/test_find.py b/Lib/ctypes/test/test_find.py diff --git a/Lib/ctypes/test/test_find.py b/Lib/ctypes/test/test_find.py
index 92ac184..0d009d1 100644 index 1ff9d01..59def26 100644
--- a/Lib/ctypes/test/test_find.py --- a/Lib/ctypes/test/test_find.py
+++ b/Lib/ctypes/test/test_find.py +++ b/Lib/ctypes/test/test_find.py
@@ -112,10 +112,12 @@ class FindLibraryLinux(unittest.TestCase): @@ -113,10 +113,12 @@ class FindLibraryLinux(unittest.TestCase):
# LD_LIBRARY_PATH) # LD_LIBRARY_PATH)
self.assertEqual(find_library(libname), 'lib%s.so' % libname) self.assertEqual(find_library(libname), 'lib%s.so' % libname)

View File

@@ -1,4 +1,4 @@
From b94995e0c694ec9561efec0d1a59b323340e6105 Mon Sep 17 00:00:00 2001 From 46856e692377d21be3562f6f90c242f5c9594ae2 Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com> From: Mingli Yu <mingli.yu@windriver.com>
Date: Mon, 5 Aug 2019 15:57:39 +0800 Date: Mon, 5 Aug 2019 15:57:39 +0800
Subject: [PATCH] test_locale.py: correct the test output format Subject: [PATCH] test_locale.py: correct the test output format
@@ -23,19 +23,19 @@ Before this patch:
Upstream-Status: Submitted [https://github.com/python/cpython/pull/15132] Upstream-Status: Submitted [https://github.com/python/cpython/pull/15132]
Rebased for 3.9.4, still not accepted upstream Signed-off-by: Alejandro Hernandez <alejandro@enedino.org> Rebased for 3.9.4, still not accepted upstream Signed-off-by: Alejandro Hernandez <alejandro@enedino.org>
Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
--- ---
Lib/test/test_locale.py | 2 +- Lib/test/test_locale.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: Python-3.9.4/Lib/test/test_locale.py diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
=================================================================== index f844e62..04df0c2 100644
--- Python-3.9.4.orig/Lib/test/test_locale.py --- a/Lib/test/test_locale.py
+++ Python-3.9.4/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py
@@ -562,7 +562,7 @@ class TestMiscellaneous(unittest.TestCas @@ -564,7 +564,7 @@ class TestMiscellaneous(unittest.TestCase):
self.skipTest('test needs Turkish locale') self.skipTest('test needs Turkish locale')
loc = locale.getlocale(locale.LC_CTYPE) loc = locale.getlocale(locale.LC_CTYPE)
if verbose: if verbose:

View File

@@ -1,4 +1,4 @@
From a2dd127b4163aff6cc35af0d0251321964232ad4 Mon Sep 17 00:00:00 2001 From 246c5ffe75a2d494e415d8a7522df9fe22056d41 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 7 Oct 2019 13:22:14 +0200 Date: Mon, 7 Oct 2019 13:22:14 +0200
Subject: [PATCH] setup.py: do not report missing dependencies for disabled Subject: [PATCH] setup.py: do not report missing dependencies for disabled
@@ -14,14 +14,14 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org> Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org>
--- ---
setup.py | 4 ++++ setup.py | 8 ++++++++
1 file changed, 4 insertions(+) 1 file changed, 8 insertions(+)
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
index 7691258..ec3f2a4 100644 index 2be4738..62f0e18 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -408,6 +408,14 @@ class PyBuildExt(build_ext): @@ -517,6 +517,14 @@ class PyBuildExt(build_ext):
print("%-*s %-*s %-*s" % (longest, e, longest, f, print("%-*s %-*s %-*s" % (longest, e, longest, f,
longest, g)) longest, g))

View File

@@ -1,4 +1,4 @@
From 863c09f640a5dfd33ff22915b0d5fee7bc5df70a Mon Sep 17 00:00:00 2001 From 788cd0464ee2b175493a0167ceee8c0045ce323c Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Sun, 16 Feb 2020 17:50:25 +0100 Date: Sun, 16 Feb 2020 17:50:25 +0100
Subject: [PATCH] configure.ac, setup.py: do not add a curses include path from Subject: [PATCH] configure.ac, setup.py: do not add a curses include path from
@@ -11,16 +11,17 @@ as dnf failures).
Upstream-Status: Inappropriate [oe-core specific] Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
--- ---
configure.ac | 6 ------ configure.ac | 6 ------
setup.py | 2 -- setup.py | 2 --
2 files changed, 8 deletions(-) 2 files changed, 8 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 915f475..c911011 100644 index e5e3df8..bfdd987 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -4828,12 +4828,6 @@ then @@ -5092,12 +5092,6 @@ then
[Define if you have struct stat.st_mtimensec]) [Define if you have struct stat.st_mtimensec])
fi fi
@@ -34,10 +35,10 @@ index 915f475..c911011 100644
# On Solaris, term.h requires curses.h # On Solaris, term.h requires curses.h
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
index b0f1541..7208cd0 100644 index 62f0e18..c190002 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -973,8 +973,6 @@ class PyBuildExt(build_ext): @@ -1169,8 +1169,6 @@ class PyBuildExt(build_ext):
panel_library = 'panel' panel_library = 'panel'
if curses_library == 'ncursesw': if curses_library == 'ncursesw':
curses_defines.append(('HAVE_NCURSESW', '1')) curses_defines.append(('HAVE_NCURSESW', '1'))

View File

@@ -1,4 +1,4 @@
From f6411021856bafedd784748ec33494151e783b51 Mon Sep 17 00:00:00 2001 From 99cfdb5f3debd38f50b73a7713161f8b56ce842e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 14 May 2013 15:00:26 -0700 Date: Tue, 14 May 2013 15:00:26 -0700
Subject: [PATCH] python3: Add target and native recipes Subject: [PATCH] python3: Add target and native recipes
@@ -12,6 +12,7 @@ Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
--- ---
Lib/distutils/sysconfig.py | 14 +++++++++++--- Lib/distutils/sysconfig.py | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-) 1 file changed, 11 insertions(+), 3 deletions(-)
@@ -55,6 +56,3 @@ index 3414a76..361d3a1 100644
"python" + get_python_version()) "python" + get_python_version())
if standard_lib: if standard_lib:
return libpython return libpython
--
2.20.1

View File

@@ -1,4 +1,4 @@
From ba7202700578d435b07cfdfb7b57e83185752800 Mon Sep 17 00:00:00 2001 From 6a23d52c905cd1f6a5944255903ec86ea8b904bb Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei@gherzan.ro> From: Andrei Gherzan <andrei@gherzan.ro>
Date: Mon, 28 Jan 2019 15:57:54 +0000 Date: Mon, 28 Jan 2019 15:57:54 +0000
Subject: [PATCH] _tkinter module needs tk module along with tcl. tk is not yet Subject: [PATCH] _tkinter module needs tk module along with tcl. tk is not yet
@@ -15,10 +15,10 @@ Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
index ab18ff0..7691258 100644 index 11b5cf5..2be4738 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -1706,8 +1706,8 @@ class PyBuildExt(build_ext): @@ -1895,8 +1895,8 @@ class PyBuildExt(build_ext):
self.detect_decimal() self.detect_decimal()
self.detect_ctypes() self.detect_ctypes()
self.detect_multiprocessing() self.detect_multiprocessing()

View File

@@ -1,4 +1,4 @@
From 62336285cba38017b35cb761c03f0c7e80a671a3 Mon Sep 17 00:00:00 2001 From 5b0d1212d661e9a8a36738279fc9109f96eebd25 Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@windriver.com> From: Mark Hatle <mark.hatle@windriver.com>
Date: Wed, 21 Sep 2011 20:55:33 -0500 Date: Wed, 21 Sep 2011 20:55:33 -0500
Subject: [PATCH] Lib/cgi.py: Update the script as mentioned in the comment Subject: [PATCH] Lib/cgi.py: Update the script as mentioned in the comment
@@ -12,7 +12,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
1 file changed, 1 insertion(+), 10 deletions(-) 1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/Lib/cgi.py b/Lib/cgi.py diff --git a/Lib/cgi.py b/Lib/cgi.py
index 8cf6687..094c7b4 100755 index 6cb8cf2..a873ff3 100755
--- a/Lib/cgi.py --- a/Lib/cgi.py
+++ b/Lib/cgi.py +++ b/Lib/cgi.py
@@ -1,13 +1,4 @@ @@ -1,13 +1,4 @@

View File

@@ -1,4 +1,8 @@
configure.ac: add CROSSPYTHONPATH into PYTHONPATH for PYTHON_FOR_BUILD From baa3a232e64e9bf5ae945366efdb8088ccf9b828 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda <ricardo@ribalda.com>
Date: Tue, 18 Nov 2014 03:35:33 -0500
Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for
PYTHON_FOR_BUILD
When building x86->x86 the system will try to execute .so and related items When building x86->x86 the system will try to execute .so and related items
from the default PYTHONPATH. This will fail if the target CPU contains from the default PYTHONPATH. This will fail if the target CPU contains
@@ -10,11 +14,16 @@ Upstream-Status: Inappropriate [OE-Core integration specific]
Credits-to: Mark Hatle <mark.hatle@windriver.com> Credits-to: Mark Hatle <mark.hatle@windriver.com>
Credits-to: Jackie Huang <jackie.huang@windriver.com> Credits-to: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 4ab19a6..7036a53 100644 index d0db062..e5e3df8 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -76,7 +76,7 @@ if test "$cross_compiling" = yes; then @@ -83,7 +83,7 @@ if test "$cross_compiling" = yes; then
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
fi fi
AC_MSG_RESULT($interp) AC_MSG_RESULT($interp)

View File

@@ -1,4 +1,4 @@
From 8b8583fb4f2bb3421e31ef06d17c04deec431c7e Mon Sep 17 00:00:00 2001 From 7cc02dfa593d1350a689d64a7a6f2dc6478afe24 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org> From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 13 Jul 2021 23:19:29 +0100 Date: Tue, 13 Jul 2021 23:19:29 +0100
Subject: [PATCH] python3: Fix make race Subject: [PATCH] python3: Fix make race
@@ -18,10 +18,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in diff --git a/Makefile.pre.in b/Makefile.pre.in
index 69d47a2..c471b60 100644 index 5e13ba2..026bffd 100644
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -1528,7 +1528,7 @@ TESTSUBDIRS= ctypes/test \ @@ -1527,7 +1527,7 @@ TESTSUBDIRS= ctypes/test \
unittest/test unittest/test/testmock unittest/test unittest/test/testmock
TEST_MODULES=@TEST_MODULES@ TEST_MODULES=@TEST_MODULES@

View File

@@ -1,4 +1,4 @@
From 57d073c12e7bede29919117b0141df14015eb27f Mon Sep 17 00:00:00 2001 From 8632f25ac4e2c53a3c2c8a1b4fc97fc86e8aad5a Mon Sep 17 00:00:00 2001
From: Tyler Hall <tylerwhall@gmail.com> From: Tyler Hall <tylerwhall@gmail.com>
Date: Sun, 4 May 2014 20:06:43 -0400 Date: Sun, 4 May 2014 20:06:43 -0400
Subject: [PATCH] python-config: Revert to using distutils.sysconfig Subject: [PATCH] python-config: Revert to using distutils.sysconfig
@@ -16,11 +16,11 @@ Upstream-Status: Inappropriate [Embedded Specific]
Signed-off-by: Tyler Hall <tylerwhall@gmail.com> Signed-off-by: Tyler Hall <tylerwhall@gmail.com>
--- ---
Misc/python-config.in | 10 +++++----- Misc/python-config.in | 12 +++++++-----
1 file changed, 5 insertions(+), 5 deletions(-) 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Misc/python-config.in b/Misc/python-config.in diff --git a/Misc/python-config.in b/Misc/python-config.in
index ebd99da..13e57ae 100644 index ebd99da..0492e08 100644
--- a/Misc/python-config.in --- a/Misc/python-config.in
+++ b/Misc/python-config.in +++ b/Misc/python-config.in
@@ -6,7 +6,9 @@ @@ -6,7 +6,9 @@
@@ -34,7 +34,7 @@ index ebd99da..13e57ae 100644
valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags',
'ldflags', 'extension-suffix', 'help', 'abiflags', 'configdir', 'ldflags', 'extension-suffix', 'help', 'abiflags', 'configdir',
@@ -35,14 +35,14 @@ if '--help' in opt_flags: @@ -35,14 +37,14 @@ if '--help' in opt_flags:
for opt in opt_flags: for opt in opt_flags:
if opt == '--prefix': if opt == '--prefix':

View File

@@ -41,7 +41,7 @@ SRC_URI:append:class-native = " \
file://12-distutils-prefix-is-inside-staging-area.patch \ file://12-distutils-prefix-is-inside-staging-area.patch \
file://0001-Don-t-search-system-for-headers-libraries.patch \ file://0001-Don-t-search-system-for-headers-libraries.patch \
" "
SRC_URI[sha256sum] = "5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002" SRC_URI[sha256sum] = "a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177"
# exclude pre-releases for both python 2.x and 3.x # exclude pre-releases for both python 2.x and 3.x
UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"