diff options
Diffstat (limited to 'meta/recipes-devtools/automake/automake/python-libdir.patch')
-rw-r--r-- | meta/recipes-devtools/automake/automake/python-libdir.patch | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch index 63dafca012..0783600588 100644 --- a/meta/recipes-devtools/automake/automake/python-libdir.patch +++ b/meta/recipes-devtools/automake/automake/python-libdir.patch | |||
@@ -2,11 +2,11 @@ Upstream-Status: Inappropriate [embedded specific] | |||
2 | 2 | ||
3 | Signed-off-by: Kumar Gala <galak@kernel.crashing.org> | 3 | Signed-off-by: Kumar Gala <galak@kernel.crashing.org> |
4 | 4 | ||
5 | Index: automake-1.11.1/m4/python.m4 | 5 | Index: automake-1.11.3/m4/python.m4 |
6 | =================================================================== | 6 | =================================================================== |
7 | --- automake-1.11.1.orig/m4/python.m4 | 7 | --- automake-1.11.3.orig/m4/python.m4 2012-01-31 11:41:18.000000000 +0000 |
8 | +++ automake-1.11.1/m4/python.m4 | 8 | +++ automake-1.11.3/m4/python.m4 2012-04-24 10:04:57.726413598 +0000 |
9 | @@ -88,12 +88,13 @@ python2.1 python2.0]) | 9 | @@ -92,12 +92,13 @@ |
10 | [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) | 10 | [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) |
11 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) | 11 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) |
12 | 12 | ||
@@ -22,16 +22,17 @@ Index: automake-1.11.1/m4/python.m4 | |||
22 | AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) | 22 | AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) |
23 | 23 | ||
24 | dnl At times (like when building shared libraries) you may want | 24 | dnl At times (like when building shared libraries) you may want |
25 | @@ -122,7 +123,7 @@ python2.1 python2.0]) | 25 | @@ -123,7 +124,8 @@ |
26 | else | ||
26 | am_py_prefix=$prefix | 27 | am_py_prefix=$prefix |
27 | fi | 28 | 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 | - 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 | + 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 || |
30 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | 31 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` |
31 | case $am_cv_python_pythondir in | 32 | case $am_cv_python_pythondir in |
32 | $am_py_prefix*) | 33 | $am_py_prefix*) |
33 | am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` | 34 | am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` |
34 | @@ -132,7 +133,7 @@ python2.1 python2.0]) | 35 | @@ -133,7 +135,7 @@ |
35 | case $am_py_prefix in | 36 | case $am_py_prefix in |
36 | /usr|/System*) ;; | 37 | /usr|/System*) ;; |
37 | *) | 38 | *) |
@@ -40,16 +41,17 @@ Index: automake-1.11.1/m4/python.m4 | |||
40 | ;; | 41 | ;; |
41 | esac | 42 | esac |
42 | ;; | 43 | ;; |
43 | @@ -160,7 +161,7 @@ python2.1 python2.0]) | 44 | @@ -158,7 +160,8 @@ |
45 | else | ||
44 | am_py_exec_prefix=$exec_prefix | 46 | am_py_exec_prefix=$exec_prefix |
45 | fi | 47 | 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 || | 48 | - 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"` | 49 | + 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 || |
48 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | 50 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` |
49 | case $am_cv_python_pyexecdir in | 51 | case $am_cv_python_pyexecdir in |
50 | $am_py_exec_prefix*) | 52 | $am_py_exec_prefix*) |
51 | am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` | 53 | am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` |
52 | @@ -170,7 +171,7 @@ python2.1 python2.0]) | 54 | @@ -168,7 +171,7 @@ |
53 | case $am_py_exec_prefix in | 55 | case $am_py_exec_prefix in |
54 | /usr|/System*) ;; | 56 | /usr|/System*) ;; |
55 | *) | 57 | *) |