| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame^] | 1 | From 045c99b5f1eb6e4e0d8ad1ef9f0ba6574f738150 Mon Sep 17 00:00:00 2001 | 
|  | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 
|  | 3 | Date: Fri, 23 Oct 2015 12:25:09 +0300 | 
|  | 4 | Subject: [PATCH] Do not use the shell version of python-config that was | 
|  | 5 | introduced in 3.4 | 
|  | 6 |  | 
|  | 7 | Revert instead to the original python version: it has our tweaks and | 
|  | 8 | outputs directories correctly. | 
|  | 9 |  | 
|  | 10 | Upstream-Status: Inappropriate [oe-specific] | 
|  | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 
|  | 12 | --- | 
|  | 13 | Makefile.pre.in | 9 +++------ | 
|  | 14 | 1 file changed, 3 insertions(+), 6 deletions(-) | 
|  | 15 |  | 
|  | 16 | diff --git a/Makefile.pre.in b/Makefile.pre.in | 
|  | 17 | index d7fc9a0..47e60bc 100644 | 
|  | 18 | --- a/Makefile.pre.in | 
|  | 19 | +++ b/Makefile.pre.in | 
|  | 20 | @@ -1270,12 +1270,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 | 
|  | 22 | # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} | 
|  | 23 | 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 | 
|  | 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 | -- | 
|  | 37 | 2.1.4 | 
|  | 38 |  |