diff options
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.patch | 25 |
1 files changed, 11 insertions, 14 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 index 8ea3f03fe0..83fd52d87f 100644 --- 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 | |||
@@ -1,6 +1,6 @@ | |||
1 | From 04df959365e2b54d7503edf0e5534ff094284f2d Mon Sep 17 00:00:00 2001 | 1 | From 148861fa16f2aaacd518770f337ea54b5182f981 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 23 Oct 2015 12:25:09 +0300 | 3 | Date: Tue, 29 Jan 2019 15:03:01 +0100 |
4 | Subject: [PATCH] Do not use the shell version of python-config that was | 4 | Subject: [PATCH] Do not use the shell version of python-config that was |
5 | introduced in 3.4 | 5 | introduced in 3.4 |
6 | 6 | ||
@@ -14,25 +14,22 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 1 file changed, 3 insertions(+), 6 deletions(-) | 14 | 1 file changed, 3 insertions(+), 6 deletions(-) |
15 | 15 | ||
16 | diff --git a/Makefile.pre.in b/Makefile.pre.in | 16 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
17 | index 236f005..5c4337f 100644 | 17 | index 2d2e11f..cc19942 100644 |
18 | --- a/Makefile.pre.in | 18 | --- a/Makefile.pre.in |
19 | +++ b/Makefile.pre.in | 19 | +++ b/Makefile.pre.in |
20 | @@ -1348,12 +1348,9 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh | 20 | @@ -1431,12 +1431,9 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh |
21 | sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py | 21 | sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py |
22 | # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} | 22 | @ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} |
23 | LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config | 23 | LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config |
24 | - # On Darwin, always use the python version of the script, the shell | 24 | - @ # On Darwin, always use the python version of the script, the shell |
25 | - # version doesn't use the compiler customizations that are provided | 25 | - @ # version doesn't use the compiler customizations that are provided |
26 | - # in python (_osx_support.py). | 26 | - @ # in python (_osx_support.py). |
27 | - if test `uname -s` = Darwin; then \ | 27 | - @if test `uname -s` = Darwin; then \ |
28 | - cp python-config.py python-config; \ | 28 | - cp python-config.py python-config; \ |
29 | - fi | 29 | - fi |
30 | + # In OpenEmbedded, always use the python version of the script, the shell | 30 | + @ # In OpenEmbedded, always use the python version of the script, the shell |
31 | + # version is broken in multiple ways, and doesn't return correct directories | 31 | + @ # version is broken in multiple ways, and doesn't return correct directories |
32 | + cp python-config.py python-config | 32 | + cp python-config.py python-config |
33 | 33 | ||
34 | 34 | ||
35 | # Install the include files | 35 | # Install the include files |
36 | -- | ||
37 | 2.11.0 | ||
38 | |||