summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/automake/automake/python-libdir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/automake/automake/python-libdir.patch')
-rw-r--r--meta/recipes-devtools/automake/automake/python-libdir.patch41
1 files changed, 22 insertions, 19 deletions
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch
index 0783600..47541bd 100644
--- a/meta/recipes-devtools/automake/automake/python-libdir.patch
+++ b/meta/recipes-devtools/automake/automake/python-libdir.patch
@@ -2,11 +2,14 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-Index: automake-1.11.3/m4/python.m4
-===================================================================
---- automake-1.11.3.orig/m4/python.m4 2012-01-31 11:41:18.000000000 +0000
-+++ automake-1.11.3/m4/python.m4 2012-04-24 10:04:57.726413598 +0000
-@@ -92,12 +92,13 @@
+Updated for automake-1.12.6
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+
+diff -Nurd automake-1.12.6/m4/python.m4 automake-1.12.6/m4/python.m4
+--- automake-1.12.6/m4/python.m4 2012-12-13 22:02:25.000000000 +0200
++++ automake-1.12.6/m4/python.m4 2012-12-27 17:40:26.558164660 +0200
+@@ -91,12 +91,13 @@
[am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
@@ -22,17 +25,17 @@ Index: automake-1.11.3/m4/python.m4
AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
dnl At times (like when building shared libraries) you may want
-@@ -123,7 +124,8 @@
- else
- am_py_prefix=$prefix
- fi
-- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
-+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
+@@ -148,7 +149,8 @@
+ else:
+ from distutils import sysconfig
+ sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+-sys.stdout.write(sitedir)"`
++sys.stdout.write(sitedir)" ||
+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
case $am_cv_python_pythondir in
$am_py_prefix*)
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
-@@ -133,7 +135,7 @@
+@@ -158,7 +160,7 @@
case $am_py_prefix in
/usr|/System*) ;;
*)
@@ -41,17 +44,17 @@ Index: automake-1.11.3/m4/python.m4
;;
esac
;;
-@@ -158,7 +160,8 @@
- else
- am_py_exec_prefix=$exec_prefix
- fi
-- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
-+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
+@@ -190,7 +192,8 @@
+ else:
+ from distutils import sysconfig
+ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+-sys.stdout.write(sitedir)"`
++sys.stdout.write(sitedir)" ||
+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
case $am_cv_python_pyexecdir in
$am_py_exec_prefix*)
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
-@@ -168,7 +171,7 @@
+@@ -200,7 +203,7 @@
case $am_py_exec_prefix in
/usr|/System*) ;;
*)
OpenPOWER on IntegriCloud