blob: 8ea3f03fe038fd984e64e0163d3439d1492dc23e [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001From 04df959365e2b54d7503edf0e5534ff094284f2d Mon Sep 17 00:00:00 2001
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 23 Oct 2015 12:25:09 +0300
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 Makefile.pre.in | 9 +++------
14 1 file changed, 3 insertions(+), 6 deletions(-)
15
16diff --git a/Makefile.pre.in b/Makefile.pre.in
Brad Bishopd7bf8c12018-02-25 22:55:05 -050017index 236f005..5c4337f 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050018--- a/Makefile.pre.in
19+++ b/Makefile.pre.in
Brad Bishopd7bf8c12018-02-25 22:55:05 -050020@@ -1348,12 +1348,9 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050021 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}
Brad Bishopd7bf8c12018-02-25 22:55:05 -050023 LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050024- # On Darwin, always use the python version of the script, the shell
25- # version doesn't use the compiler customizations that are provided
26- # in python (_osx_support.py).
27- if test `uname -s` = Darwin; then \
28- cp python-config.py python-config; \
29- fi
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
32+ cp python-config.py python-config
33
34
35 # Install the include files
36--
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500372.11.0
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050038