diff options
Diffstat (limited to 'meta/recipes-devtools/automake/automake/python-libdir.patch')
-rw-r--r-- | meta/recipes-devtools/automake/automake/python-libdir.patch | 60 |
1 files changed, 60 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 0000000000..63dafca012 --- /dev/null +++ b/meta/recipes-devtools/automake/automake/python-libdir.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Signed-off-by: Kumar Gala <galak@kernel.crashing.org> | ||
4 | |||
5 | Index: automake-1.11.1/m4/python.m4 | ||
6 | =================================================================== | ||
7 | --- automake-1.11.1.orig/m4/python.m4 | ||
8 | +++ automake-1.11.1/m4/python.m4 | ||
9 | @@ -88,12 +88,13 @@ python2.1 python2.0]) | ||
10 | [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) | ||
11 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) | ||
12 | |||
13 | - dnl Use the values of $prefix and $exec_prefix for the corresponding | ||
14 | - dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made | ||
15 | + dnl Use the values of $prefix, $libdir and $exec_prefix for the corresponding | ||
16 | + dnl values of PYTHON_PREFIX PYTHON_LIB_PREFIX, and PYTHON_EXEC_PREFIX. These are made | ||
17 | dnl distinct variables so they can be overridden if need be. However, | ||
18 | dnl general consensus is that you shouldn't need this ability. | ||
19 | |||
20 | AC_SUBST([PYTHON_PREFIX], ['${prefix}']) | ||
21 | + AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}']) | ||
22 | AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) | ||
23 | |||
24 | dnl At times (like when building shared libraries) you may want | ||
25 | @@ -122,7 +123,7 @@ python2.1 python2.0]) | ||
26 | am_py_prefix=$prefix | ||
27 | fi | ||
28 | 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 || | ||
29 | - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` | ||
30 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
31 | case $am_cv_python_pythondir in | ||
32 | $am_py_prefix*) | ||
33 | am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` | ||
34 | @@ -132,7 +133,7 @@ python2.1 python2.0]) | ||
35 | case $am_py_prefix in | ||
36 | /usr|/System*) ;; | ||
37 | *) | ||
38 | - am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages | ||
39 | + am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages | ||
40 | ;; | ||
41 | esac | ||
42 | ;; | ||
43 | @@ -160,7 +161,7 @@ python2.1 python2.0]) | ||
44 | am_py_exec_prefix=$exec_prefix | ||
45 | fi | ||
46 | 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 || | ||
47 | - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` | ||
48 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
49 | case $am_cv_python_pyexecdir in | ||
50 | $am_py_exec_prefix*) | ||
51 | am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` | ||
52 | @@ -170,7 +171,7 @@ python2.1 python2.0]) | ||
53 | case $am_py_exec_prefix in | ||
54 | /usr|/System*) ;; | ||
55 | *) | ||
56 | - am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages | ||
57 | + am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages | ||
58 | ;; | ||
59 | esac | ||
60 | ;; | ||