diff options
Diffstat (limited to 'package/python3/0029-python-config.sh-don-t-reassign-prefix.patch')
| -rw-r--r-- | package/python3/0029-python-config.sh-don-t-reassign-prefix.patch | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch index cb6f59bfae..49137f27ea 100644 --- a/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch +++ b/package/python3/0029-python-config.sh-don-t-reassign-prefix.patch @@ -22,34 +22,32 @@ 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> -[aduskett@gmail.com: Update for python 3.6.4] -Signed-off-by: Adam Duskett <aduskett@gmail.com> --- - Misc/python-config.sh.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + 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 9e259c0..8b249d9 100644 +index f905a71..e06be0f 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. +@@ -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#") - exec_prefix_real=${prefix_real} includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#") -@@ -49,7 +49,7 @@ LINKFORSHARED="@LINKFORSHARED@" +@@ -47,7 +46,7 @@ LINKFORSHARED="@LINKFORSHARED@" OPT="@OPT@" PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" LDVERSION="@LDVERSION@" --LIBDEST=${prefix_real}/lib/python${VERSION} +-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@" -- -2.14.3 +1.8.3.1 |
