diff options
Diffstat (limited to 'meta/recipes-devtools/automake/automake/python-libdir.patch')
-rw-r--r-- | meta/recipes-devtools/automake/automake/python-libdir.patch | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch index 2a48b133eb..ee1f725f76 100644 --- a/meta/recipes-devtools/automake/automake/python-libdir.patch +++ b/meta/recipes-devtools/automake/automake/python-libdir.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 472a3d36c97ef7535f05d6c185edcbc22b0074c4 Mon Sep 17 00:00:00 2001 | 1 | From a80dacd5124d0713cf2c986b28d736e78dc6b0ca Mon Sep 17 00:00:00 2001 |
2 | From: Kumar Gala <galak@kernel.crashing.org> | 2 | From: Kumar Gala <galak@kernel.crashing.org> |
3 | Date: Thu, 11 Aug 2011 01:26:33 -0500 | 3 | Date: Thu, 11 Aug 2011 01:26:33 -0500 |
4 | Subject: [PATCH 1/4] automake: Update for python.m4 to respect libdir | 4 | Subject: [PATCH] automake: Update for python.m4 to respect libdir |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [embedded specific] | 6 | Upstream-Status: Inappropriate [embedded specific] |
7 | 7 | ||
@@ -17,10 +17,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
17 | 1 file changed, 7 insertions(+), 20 deletions(-) | 17 | 1 file changed, 7 insertions(+), 20 deletions(-) |
18 | 18 | ||
19 | diff --git a/m4/python.m4 b/m4/python.m4 | 19 | diff --git a/m4/python.m4 b/m4/python.m4 |
20 | index 5b2c695..ed19261 100644 | 20 | index 63c0a0e..7bbd2d2 100644 |
21 | --- a/m4/python.m4 | 21 | --- a/m4/python.m4 |
22 | +++ b/m4/python.m4 | 22 | +++ b/m4/python.m4 |
23 | @@ -91,12 +91,13 @@ AC_DEFUN([AM_PATH_PYTHON], | 23 | @@ -94,12 +94,13 @@ AC_DEFUN([AM_PATH_PYTHON], |
24 | [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) | 24 | [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) |
25 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) | 25 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) |
26 | 26 | ||
@@ -36,7 +36,7 @@ index 5b2c695..ed19261 100644 | |||
36 | AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) | 36 | AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) |
37 | 37 | ||
38 | dnl At times (like when building shared libraries) you may want | 38 | dnl At times (like when building shared libraries) you may want |
39 | @@ -141,14 +142,7 @@ except ImportError: | 39 | @@ -144,14 +145,7 @@ except ImportError: |
40 | else | 40 | else |
41 | am_py_prefix=$prefix | 41 | am_py_prefix=$prefix |
42 | fi | 42 | fi |
@@ -52,7 +52,7 @@ index 5b2c695..ed19261 100644 | |||
52 | case $am_cv_python_pythondir in | 52 | case $am_cv_python_pythondir in |
53 | $am_py_prefix*) | 53 | $am_py_prefix*) |
54 | am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` | 54 | am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` |
55 | @@ -158,7 +152,7 @@ sys.stdout.write(sitedir)"` | 55 | @@ -161,7 +155,7 @@ sys.stdout.write(sitedir)"` |
56 | case $am_py_prefix in | 56 | case $am_py_prefix in |
57 | /usr|/System*) ;; | 57 | /usr|/System*) ;; |
58 | *) | 58 | *) |
@@ -61,7 +61,7 @@ index 5b2c695..ed19261 100644 | |||
61 | ;; | 61 | ;; |
62 | esac | 62 | esac |
63 | ;; | 63 | ;; |
64 | @@ -183,14 +177,7 @@ sys.stdout.write(sitedir)"` | 64 | @@ -186,14 +180,7 @@ sys.stdout.write(sitedir)"` |
65 | else | 65 | else |
66 | am_py_exec_prefix=$exec_prefix | 66 | am_py_exec_prefix=$exec_prefix |
67 | fi | 67 | fi |
@@ -77,7 +77,7 @@ index 5b2c695..ed19261 100644 | |||
77 | case $am_cv_python_pyexecdir in | 77 | case $am_cv_python_pyexecdir in |
78 | $am_py_exec_prefix*) | 78 | $am_py_exec_prefix*) |
79 | am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` | 79 | am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` |
80 | @@ -200,7 +187,7 @@ sys.stdout.write(sitedir)"` | 80 | @@ -203,7 +190,7 @@ sys.stdout.write(sitedir)"` |
81 | case $am_py_exec_prefix in | 81 | case $am_py_exec_prefix in |
82 | /usr|/System*) ;; | 82 | /usr|/System*) ;; |
83 | *) | 83 | *) |
@@ -86,6 +86,3 @@ index 5b2c695..ed19261 100644 | |||
86 | ;; | 86 | ;; |
87 | esac | 87 | esac |
88 | ;; | 88 | ;; |
89 | -- | ||
90 | 2.8.1 | ||
91 | |||