diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/automake/automake/python-libdir.patch | 62 |
1 files changed, 44 insertions, 18 deletions
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch index 47541bdedc..2a48b133eb 100644 --- a/meta/recipes-devtools/automake/automake/python-libdir.patch +++ b/meta/recipes-devtools/automake/automake/python-libdir.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From 472a3d36c97ef7535f05d6c185edcbc22b0074c4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kumar Gala <galak@kernel.crashing.org> | ||
3 | Date: Thu, 11 Aug 2011 01:26:33 -0500 | ||
4 | Subject: [PATCH 1/4] automake: Update for python.m4 to respect libdir | ||
5 | |||
1 | Upstream-Status: Inappropriate [embedded specific] | 6 | Upstream-Status: Inappropriate [embedded specific] |
2 | 7 | ||
3 | Signed-off-by: Kumar Gala <galak@kernel.crashing.org> | 8 | Signed-off-by: Kumar Gala <galak@kernel.crashing.org> |
@@ -5,11 +10,17 @@ Signed-off-by: Kumar Gala <galak@kernel.crashing.org> | |||
5 | Updated for automake-1.12.6 | 10 | Updated for automake-1.12.6 |
6 | 11 | ||
7 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | 12 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> |
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
14 | |||
15 | --- | ||
16 | m4/python.m4 | 27 +++++++-------------------- | ||
17 | 1 file changed, 7 insertions(+), 20 deletions(-) | ||
8 | 18 | ||
9 | diff -Nurd automake-1.12.6/m4/python.m4 automake-1.12.6/m4/python.m4 | 19 | diff --git a/m4/python.m4 b/m4/python.m4 |
10 | --- automake-1.12.6/m4/python.m4 2012-12-13 22:02:25.000000000 +0200 | 20 | index 5b2c695..ed19261 100644 |
11 | +++ automake-1.12.6/m4/python.m4 2012-12-27 17:40:26.558164660 +0200 | 21 | --- a/m4/python.m4 |
12 | @@ -91,12 +91,13 @@ | 22 | +++ b/m4/python.m4 |
23 | @@ -91,12 +91,13 @@ AC_DEFUN([AM_PATH_PYTHON], | ||
13 | [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]])"`]) |
14 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) | 25 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) |
15 | 26 | ||
@@ -25,17 +36,23 @@ diff -Nurd automake-1.12.6/m4/python.m4 automake-1.12.6/m4/python.m4 | |||
25 | AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) | 36 | AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) |
26 | 37 | ||
27 | dnl At times (like when building shared libraries) you may want | 38 | dnl At times (like when building shared libraries) you may want |
28 | @@ -148,7 +149,8 @@ | 39 | @@ -141,14 +142,7 @@ except ImportError: |
29 | else: | 40 | else |
30 | from distutils import sysconfig | 41 | am_py_prefix=$prefix |
31 | sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') | 42 | fi |
43 | - am_cv_python_pythondir=`$PYTHON -c " | ||
44 | -$am_python_setup_sysconfig | ||
45 | -if can_use_sysconfig: | ||
46 | - sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) | ||
47 | -else: | ||
48 | - from distutils import sysconfig | ||
49 | - sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') | ||
32 | -sys.stdout.write(sitedir)"` | 50 | -sys.stdout.write(sitedir)"` |
33 | +sys.stdout.write(sitedir)" || | 51 | + am_cv_python_pythondir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` |
34 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
35 | case $am_cv_python_pythondir in | 52 | case $am_cv_python_pythondir in |
36 | $am_py_prefix*) | 53 | $am_py_prefix*) |
37 | am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` | 54 | am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` |
38 | @@ -158,7 +160,7 @@ | 55 | @@ -158,7 +152,7 @@ sys.stdout.write(sitedir)"` |
39 | case $am_py_prefix in | 56 | case $am_py_prefix in |
40 | /usr|/System*) ;; | 57 | /usr|/System*) ;; |
41 | *) | 58 | *) |
@@ -44,17 +61,23 @@ diff -Nurd automake-1.12.6/m4/python.m4 automake-1.12.6/m4/python.m4 | |||
44 | ;; | 61 | ;; |
45 | esac | 62 | esac |
46 | ;; | 63 | ;; |
47 | @@ -190,7 +192,8 @@ | 64 | @@ -183,14 +177,7 @@ sys.stdout.write(sitedir)"` |
48 | else: | 65 | else |
49 | from distutils import sysconfig | 66 | am_py_exec_prefix=$exec_prefix |
50 | sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') | 67 | fi |
68 | - am_cv_python_pyexecdir=`$PYTHON -c " | ||
69 | -$am_python_setup_sysconfig | ||
70 | -if can_use_sysconfig: | ||
71 | - sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) | ||
72 | -else: | ||
73 | - from distutils import sysconfig | ||
74 | - sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') | ||
51 | -sys.stdout.write(sitedir)"` | 75 | -sys.stdout.write(sitedir)"` |
52 | +sys.stdout.write(sitedir)" || | 76 | + am_cv_python_pyexecdir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` |
53 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
54 | case $am_cv_python_pyexecdir in | 77 | case $am_cv_python_pyexecdir in |
55 | $am_py_exec_prefix*) | 78 | $am_py_exec_prefix*) |
56 | am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` | 79 | am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` |
57 | @@ -200,7 +203,7 @@ | 80 | @@ -200,7 +187,7 @@ sys.stdout.write(sitedir)"` |
58 | case $am_py_exec_prefix in | 81 | case $am_py_exec_prefix in |
59 | /usr|/System*) ;; | 82 | /usr|/System*) ;; |
60 | *) | 83 | *) |
@@ -63,3 +86,6 @@ diff -Nurd automake-1.12.6/m4/python.m4 automake-1.12.6/m4/python.m4 | |||
63 | ;; | 86 | ;; |
64 | esac | 87 | esac |
65 | ;; | 88 | ;; |
89 | -- | ||
90 | 2.8.1 | ||
91 | |||