blob: d98f243cb121a3ac2ce841f1f3216e1b46bfb298 [file] [log] [blame]
Andrew Geissler595f6302022-01-24 19:11:47 +00001From 2406432449784243b7590009d42bd0e871253b2e Mon Sep 17 00:00:00 2001
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05002From: Alexander Kanavin <alex.kanavin@gmail.com>
Brad Bishop19323692019-04-05 15:28:33 -04003Date: Tue, 29 Jan 2019 15:03:01 +0100
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05004Subject: [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>
Andrew Geissler595f6302022-01-24 19:11:47 +000012
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050013---
14 Makefile.pre.in | 9 +++------
15 1 file changed, 3 insertions(+), 6 deletions(-)
16
17diff --git a/Makefile.pre.in b/Makefile.pre.in
Andrew Geissler595f6302022-01-24 19:11:47 +000018index ee85f35..f0aedb7 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050019--- a/Makefile.pre.in
20+++ b/Makefile.pre.in
Andrew Geissler595f6302022-01-24 19:11:47 +000021@@ -1640,12 +1640,9 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050022 sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py
Brad Bishop19323692019-04-05 15:28:33 -040023 @ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR}
Brad Bishopd7bf8c12018-02-25 22:55:05 -050024 LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config
Brad Bishop19323692019-04-05 15:28:33 -040025- @ # 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 \
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050029- cp python-config.py python-config; \
30- fi
Brad Bishop19323692019-04-05 15:28:33 -040031+ @ # 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
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050033+ cp python-config.py python-config
34
35
36 # Install the include files