diff options
Diffstat (limited to 'meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch')
-rw-r--r-- | meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch b/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch new file mode 100644 index 0000000000..d28045618e --- /dev/null +++ b/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch | |||
@@ -0,0 +1,83 @@ | |||
1 | From dff74c5b19935cc11b30116a7ae9c8affdff246b 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] automake: Update for python.m4 to respect libdir | ||
5 | |||
6 | Upstream-Status: Inappropriate [embedded specific] | ||
7 | |||
8 | Signed-off-by: Kumar Gala <galak@kernel.crashing.org> | ||
9 | |||
10 | Updated for automake-1.12.6 | ||
11 | |||
12 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
14 | --- | ||
15 | m4/python.m4 | 24 ++++++------------------ | ||
16 | 1 file changed, 6 insertions(+), 18 deletions(-) | ||
17 | |||
18 | diff --git a/m4/python.m4 b/m4/python.m4 | ||
19 | index 4e7de9427..40fc5b396 100644 | ||
20 | --- a/m4/python.m4 | ||
21 | +++ b/m4/python.m4 | ||
22 | @@ -96,6 +96,8 @@ AC_DEFUN([AM_PATH_PYTHON], | ||
23 | [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`]) | ||
24 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) | ||
25 | |||
26 | + AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}']) | ||
27 | + | ||
28 | dnl At times, e.g., when building shared libraries, you may want | ||
29 | dnl to know which OS platform Python thinks this is. | ||
30 | dnl | ||
31 | @@ -251,14 +253,7 @@ except ImportError: | ||
32 | else | ||
33 | am_py_prefix=$am_cv_python_prefix | ||
34 | fi | ||
35 | - am_cv_python_pythondir=`$PYTHON -c " | ||
36 | -$am_python_setup_sysconfig | ||
37 | -if can_use_sysconfig: | ||
38 | - sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) | ||
39 | -else: | ||
40 | - from distutils import sysconfig | ||
41 | - sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') | ||
42 | -sys.stdout.write(sitedir)"` | ||
43 | + am_cv_python_pythondir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
44 | # | ||
45 | case $am_cv_python_pythondir in | ||
46 | $am_py_prefix*) | ||
47 | @@ -268,7 +263,7 @@ sys.stdout.write(sitedir)"` | ||
48 | *) | ||
49 | case $am_py_prefix in | ||
50 | /usr|/System*) ;; | ||
51 | - *) am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages" | ||
52 | + *) am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages | ||
53 | ;; | ||
54 | esac | ||
55 | ;; | ||
56 | @@ -293,14 +288,7 @@ sys.stdout.write(sitedir)"` | ||
57 | else | ||
58 | am_py_exec_prefix=$am_cv_python_exec_prefix | ||
59 | fi | ||
60 | - am_cv_python_pyexecdir=`$PYTHON -c " | ||
61 | -$am_python_setup_sysconfig | ||
62 | -if can_use_sysconfig: | ||
63 | - sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'}) | ||
64 | -else: | ||
65 | - from distutils import sysconfig | ||
66 | - sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix') | ||
67 | -sys.stdout.write(sitedir)"` | ||
68 | + am_cv_python_pyexecdir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
69 | # | ||
70 | case $am_cv_python_pyexecdir in | ||
71 | $am_py_exec_prefix*) | ||
72 | @@ -310,7 +298,7 @@ sys.stdout.write(sitedir)"` | ||
73 | *) | ||
74 | case $am_py_exec_prefix in | ||
75 | /usr|/System*) ;; | ||
76 | - *) am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages" | ||
77 | + *) am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages | ||
78 | ;; | ||
79 | esac | ||
80 | ;; | ||
81 | -- | ||
82 | 2.20.1 | ||
83 | |||