summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-11-09 21:21:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-07 14:56:54 +0000
commit990af746c250dcb1b7b46e0c887e2ccf67f67d26 (patch)
treebe448e2636be5044048d0c6f6f566a12e357a4ff /meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch
parent3c499e21f4225fdaebbb22582753f736ce7e4a73 (diff)
downloadpoky-990af746c250dcb1b7b46e0c887e2ccf67f67d26.tar.gz
python3: use the standard shell version of python3-config
There is really no reason why we can't: it only needs to be available in two versions (native/target), and the correct one can be picked via PATH priority order. This eliminates two un-upstreamable patches, one of which relies on soon to be removed distutils. (From OE-Core rev: d0145ead0f80ba4bde8e24617a8725f38eda8339) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch')
-rw-r--r--meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch b/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch
deleted file mode 100644
index d98f243cb1..0000000000
--- a/meta/recipes-devtools/python/python3/0001-Do-not-use-the-shell-version-of-python-config-that-w.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 2406432449784243b7590009d42bd0e871253b2e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 29 Jan 2019 15:03:01 +0100
4Subject: [PATCH] Do not use the shell version of python-config that was
5 introduced in 3.4
6
7Revert instead to the original python version: it has our tweaks and
8outputs directories correctly.
9
10Upstream-Status: Inappropriate [oe-specific]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12
13---
14 Makefile.pre.in | 9 +++------
15 1 file changed, 3 insertions(+), 6 deletions(-)
16
17diff --git a/Makefile.pre.in b/Makefile.pre.in
18index ee85f35..f0aedb7 100644
19--- a/Makefile.pre.in
20+++ b/Makefile.pre.in
21@@ -1640,12 +1640,9 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
22 sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py
23 @ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR}
24 LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config
25- @ # On Darwin, always use the python version of the script, the shell
26- @ # version doesn't use the compiler customizations that are provided
27- @ # in python (_osx_support.py).
28- @if test `uname -s` = Darwin; then \
29- cp python-config.py python-config; \
30- fi
31+ @ # In OpenEmbedded, always use the python version of the script, the shell
32+ @ # version is broken in multiple ways, and doesn't return correct directories
33+ cp python-config.py python-config
34
35
36 # Install the include files