| From 106d9378c61e7fa9cad0a63ba068668d54cd11b8 Mon Sep 17 00:00:00 2001 |
| From: Matt Weber <matthew.weber@rockwellcollins.com> |
| Date: Fri, 6 Oct 2017 09:54:15 -0500 |
| Subject: [PATCH] python-config.sh: don't reassign ${prefix} |
| |
| When prefix is set to a path like /usr during crossbuild |
| the sed operations end up executing twice, once for the prefix |
| reassignment and another for includedir if it is set as a string |
| including the ${prefix} variable. This results in an issue |
| when the build directory is under /usr. |
| |
| This patch updates the remaining location which uses the prefix |
| variable to also sed and update to use the real path. |
| |
| Upstream bug report: |
| https://bugs.python.org/issue31713 |
| |
| Buildroot bug: |
| https://bugs.busybox.net/show_bug.cgi?id=10361 |
| |
| Fixes failures like the following: |
| dbus-python-1.2.4 | NOK | http://autobuild.buildroot.net/results/758858efa97b6273c1b470513f5492258a6d8853 |
| |
| Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> |
| --- |
| Misc/python-config.sh.in | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in |
| index a1bc3cd5f7..164d2d3603 100644 |
| --- a/Misc/python-config.sh.in |
| +++ b/Misc/python-config.sh.in |
| @@ -31,7 +31,7 @@ prefix_real=$(installed_prefix "$0") |
| # locations. Keep prefix & exec_prefix using their original values in case |
| # they are referenced in other configure variables, to prevent double |
| # substitution, issue #22140. |
| -prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#") |
| +prefix=$prefix_build |
| exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#") |
| exec_prefix_real=${prefix_real} |
| includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#") |
| @@ -49,7 +49,7 @@ LDLIBRARY="@LDLIBRARY@" |
| OPT="@OPT@" |
| PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" |
| LDVERSION="@LDVERSION@" |
| -LIBDEST=${prefix_real}/lib/python${VERSION} |
| +LIBDEST=$( echo "${prefix}/lib/python${VERSION}" | sed "s#^$prefix_build#$prefix_real#") |
| LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#") |
| SO="@EXT_SUFFIX@" |
| PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" |
| -- |
| 2.25.1 |
| |