Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 148861fa16f2aaacd518770f337ea54b5182f981 Mon Sep 17 00:00:00 2001 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 3 | Date: Tue, 29 Jan 2019 15:03:01 +0100 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 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 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 17 | index 2d2e11f..cc19942 100644 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 18 | --- a/Makefile.pre.in |
| 19 | +++ b/Makefile.pre.in |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 20 | @@ -1431,12 +1431,9 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 21 | sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 22 | @ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 23 | LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 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 \ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 28 | - cp python-config.py python-config; \ |
| 29 | - fi |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 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 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 32 | + cp python-config.py python-config |
| 33 | |
| 34 | |
| 35 | # Install the include files |