diff options
Diffstat (limited to 'meta/recipes-devtools/automake/automake/python-libdir.patch')
-rw-r--r-- | meta/recipes-devtools/automake/automake/python-libdir.patch | 41 |
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 0783600588..47541bdedc 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] | |||
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.3/m4/python.m4 | 5 | Updated for automake-1.12.6 |
6 | =================================================================== | 6 | |
7 | --- automake-1.11.3.orig/m4/python.m4 2012-01-31 11:41:18.000000000 +0000 | 7 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> |
8 | +++ automake-1.11.3/m4/python.m4 2012-04-24 10:04:57.726413598 +0000 | 8 | |
9 | @@ -92,12 +92,13 @@ | 9 | diff -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 @@ | ||
10 | [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) | 13 | [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) |
11 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) | 14 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) |
12 | 15 | ||
@@ -22,17 +25,17 @@ Index: automake-1.11.3/m4/python.m4 | |||
22 | AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) | 25 | AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) |
23 | 26 | ||
24 | dnl At times (like when building shared libraries) you may want | 27 | dnl At times (like when building shared libraries) you may want |
25 | @@ -123,7 +124,8 @@ | 28 | @@ -148,7 +149,8 @@ |
26 | else | 29 | else: |
27 | am_py_prefix=$prefix | 30 | from distutils import sysconfig |
28 | fi | 31 | sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') |
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` | 32 | -sys.stdout.write(sitedir)"` |
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 || | 33 | +sys.stdout.write(sitedir)" || |
31 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | 34 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` |
32 | case $am_cv_python_pythondir in | 35 | case $am_cv_python_pythondir in |
33 | $am_py_prefix*) | 36 | $am_py_prefix*) |
34 | am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` | 37 | am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` |
35 | @@ -133,7 +135,7 @@ | 38 | @@ -158,7 +160,7 @@ |
36 | case $am_py_prefix in | 39 | case $am_py_prefix in |
37 | /usr|/System*) ;; | 40 | /usr|/System*) ;; |
38 | *) | 41 | *) |
@@ -41,17 +44,17 @@ Index: automake-1.11.3/m4/python.m4 | |||
41 | ;; | 44 | ;; |
42 | esac | 45 | esac |
43 | ;; | 46 | ;; |
44 | @@ -158,7 +160,8 @@ | 47 | @@ -190,7 +192,8 @@ |
45 | else | 48 | else: |
46 | am_py_exec_prefix=$exec_prefix | 49 | from distutils import sysconfig |
47 | fi | 50 | sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') |
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` | 51 | -sys.stdout.write(sitedir)"` |
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 || | 52 | +sys.stdout.write(sitedir)" || |
50 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | 53 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` |
51 | case $am_cv_python_pyexecdir in | 54 | case $am_cv_python_pyexecdir in |
52 | $am_py_exec_prefix*) | 55 | $am_py_exec_prefix*) |
53 | am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` | 56 | am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` |
54 | @@ -168,7 +171,7 @@ | 57 | @@ -200,7 +203,7 @@ |
55 | case $am_py_exec_prefix in | 58 | case $am_py_exec_prefix in |
56 | /usr|/System*) ;; | 59 | /usr|/System*) ;; |
57 | *) | 60 | *) |