package/python3/0013-Misc-python-config.sh.in-ensure-sed-invocations-only.patch

   1 From 4c0893221e2978854174806f7e14f7643eea32e7 Mon Sep 17 00:00:00 2001
   2 From: Peter Korsgaard <peter@korsgaard.com>
   3 Date: Thu, 20 Nov 2014 13:24:59 +0100
   4 Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match
   5  beginning of strings
   6
   7 The build/real prefix handling using sed breaks if build != real and the
   8 standard include / lib directories are used ($prefix/include and $prefix/lib).
   9
  10 E.G.
  11
  12 prefix_build="/usr", libdir="$prefix/lib", includedir="$prefix/include".
  13
  14 If this gets installed with make DESTDIR="/foo" install, then we end up with
  15 prefix_real = prefix = "/foo/usr" as expected, but
  16 includedir="/foo/foo/usr/include" and libdir="/foo/foo/usr/lib" because of
  17 the double sed invocation (prefix is already expanded).  Work around it by
  18 ensuring we only match the beginning of the string.
  19
  20 Submitted upstream: http://bugs.python.org/issue22907
  21
  22 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  23 ---
  24  Misc/python-config.sh.in | 12 ++++++------
  25  1 file changed, 6 insertions(+), 6 deletions(-)
  26
  27 diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
  28 index 64c81e5..f75eec5 100644
  29 --- a/Misc/python-config.sh.in
  30 +++ b/Misc/python-config.sh.in
  31 @@ -29,12 +29,12 @@ prefix_real=$(installed_prefix "$0")
  32
  33  # Use sed to fix paths from their built-to locations to their installed-to
  34  # locations.
  35 -prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#")
  36 +prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#")
  37  exec_prefix_build="@exec_prefix@"
  38 -exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#")
  39 -includedir=$(echo "@includedir@" | sed "s#$prefix_build#$prefix_real#")
  40 -libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#")
  41 -CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#")
  42 +exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#")
  43 +includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#")
  44 +libdir=$(echo "@libdir@" | sed "s#^$prefix_build#$prefix_real#")
  45 +CFLAGS=$(echo "@CFLAGS@" | sed "s#^$prefix_build#$prefix_real#")
  46  VERSION="@VERSION@"
  47  LIBM="@LIBM@"
  48  LIBC="@LIBC@"
  49 @@ -48,7 +48,7 @@ OPT="@OPT@"
  50  PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
  51  LDVERSION="@LDVERSION@"
  52  LIBDEST=${prefix}/lib/python${VERSION}
  53 -LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
  54 +LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#")
  55  SO="@SO@"
  56  PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
  57  INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}"
  58 --
  59 2.6.4
  60