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.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch
new file mode 100644
index 0000000..47541bd
--- /dev/null
+++ b/meta/recipes-devtools/automake/automake/python-libdir.patch
@@ -0,0 +1,65 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
4
5Updated for automake-1.12.6
6
7Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
8
9diff -Nurd automake-1.12.6/m4/python.m4 automake-1.12.6/m4/python.m4
10--- automake-1.12.6/m4/python.m4 2012-12-13 22:02:25.000000000 +0200
11+++ automake-1.12.6/m4/python.m4 2012-12-27 17:40:26.558164660 +0200
12@@ -91,12 +91,13 @@
13 [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
14 AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
15
16- dnl Use the values of $prefix and $exec_prefix for the corresponding
17- dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
18+ dnl Use the values of $prefix, $libdir and $exec_prefix for the corresponding
19+ dnl values of PYTHON_PREFIX PYTHON_LIB_PREFIX, and PYTHON_EXEC_PREFIX. These are made
20 dnl distinct variables so they can be overridden if need be. However,
21 dnl general consensus is that you shouldn't need this ability.
22
23 AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
24+ AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}'])
25 AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
26
27 dnl At times (like when building shared libraries) you may want
28@@ -148,7 +149,8 @@
29 else:
30 from distutils import sysconfig
31 sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
32-sys.stdout.write(sitedir)"`
33+sys.stdout.write(sitedir)" ||
34+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
35 case $am_cv_python_pythondir in
36 $am_py_prefix*)
37 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
38@@ -158,7 +160,7 @@
39 case $am_py_prefix in
40 /usr|/System*) ;;
41 *)
42- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
43+ am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages
44 ;;
45 esac
46 ;;
47@@ -190,7 +192,8 @@
48 else:
49 from distutils import sysconfig
50 sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
51-sys.stdout.write(sitedir)"`
52+sys.stdout.write(sitedir)" ||
53+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
54 case $am_cv_python_pyexecdir in
55 $am_py_exec_prefix*)
56 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
57@@ -200,7 +203,7 @@
58 case $am_py_exec_prefix in
59 /usr|/System*) ;;
60 *)
61- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
62+ am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages
63 ;;
64 esac
65 ;;