04d1699ba4
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>
[Arnout: refer to autobuild failures that still exist]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
From 21f787cb9bf0c1440981262f03bc881c5b77c0d8 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 | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
|
|
index f905a71..e06be0f 100644
|
|
--- a/Misc/python-config.sh.in
|
|
+++ b/Misc/python-config.sh.in
|
|
@@ -29,7 +29,7 @@ prefix_real=$(installed_prefix "$0")
|
|
|
|
# Use sed to fix paths from their built-to locations to their installed-to
|
|
# locations.
|
|
-prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#")
|
|
+prefix=$prefix_build
|
|
exec_prefix_build="@exec_prefix@"
|
|
exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#")
|
|
includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#")
|
|
@@ -47,7 +46,7 @@ LINKFORSHARED="@LINKFORSHARED@"
|
|
OPT="@OPT@"
|
|
PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
|
|
LDVERSION="@LDVERSION@"
|
|
-LIBDEST=${prefix}/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@"
|
|
--
|
|
1.8.3.1
|
|
|