diff options
Diffstat (limited to 'meta/recipes-devtools/automake/automake/python-libdir.patch')
-rw-r--r-- | meta/recipes-devtools/automake/automake/python-libdir.patch | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch deleted file mode 100644 index ee1f725f76..0000000000 --- a/meta/recipes-devtools/automake/automake/python-libdir.patch +++ /dev/null | |||
@@ -1,88 +0,0 @@ | |||
1 | From a80dacd5124d0713cf2c986b28d736e78dc6b0ca 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 | --- | ||
16 | m4/python.m4 | 27 +++++++-------------------- | ||
17 | 1 file changed, 7 insertions(+), 20 deletions(-) | ||
18 | |||
19 | diff --git a/m4/python.m4 b/m4/python.m4 | ||
20 | index 63c0a0e..7bbd2d2 100644 | ||
21 | --- a/m4/python.m4 | ||
22 | +++ b/m4/python.m4 | ||
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]])"`]) | ||
25 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) | ||
26 | |||
27 | - dnl Use the values of $prefix and $exec_prefix for the corresponding | ||
28 | - dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made | ||
29 | + dnl Use the values of $prefix, $libdir and $exec_prefix for the corresponding | ||
30 | + dnl values of PYTHON_PREFIX PYTHON_LIB_PREFIX, and PYTHON_EXEC_PREFIX. These are made | ||
31 | dnl distinct variables so they can be overridden if need be. However, | ||
32 | dnl general consensus is that you shouldn't need this ability. | ||
33 | |||
34 | AC_SUBST([PYTHON_PREFIX], ['${prefix}']) | ||
35 | + AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}']) | ||
36 | AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) | ||
37 | |||
38 | dnl At times (like when building shared libraries) you may want | ||
39 | @@ -144,14 +145,7 @@ except ImportError: | ||
40 | else | ||
41 | am_py_prefix=$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') | ||
50 | -sys.stdout.write(sitedir)"` | ||
51 | + am_cv_python_pythondir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
52 | case $am_cv_python_pythondir in | ||
53 | $am_py_prefix*) | ||
54 | am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` | ||
55 | @@ -161,7 +155,7 @@ sys.stdout.write(sitedir)"` | ||
56 | case $am_py_prefix in | ||
57 | /usr|/System*) ;; | ||
58 | *) | ||
59 | - am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages | ||
60 | + am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages | ||
61 | ;; | ||
62 | esac | ||
63 | ;; | ||
64 | @@ -186,14 +180,7 @@ sys.stdout.write(sitedir)"` | ||
65 | else | ||
66 | am_py_exec_prefix=$exec_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') | ||
75 | -sys.stdout.write(sitedir)"` | ||
76 | + am_cv_python_pyexecdir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
77 | case $am_cv_python_pyexecdir in | ||
78 | $am_py_exec_prefix*) | ||
79 | am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` | ||
80 | @@ -203,7 +190,7 @@ sys.stdout.write(sitedir)"` | ||
81 | case $am_py_exec_prefix in | ||
82 | /usr|/System*) ;; | ||
83 | *) | ||
84 | - am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages | ||
85 | + am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages | ||
86 | ;; | ||
87 | esac | ||
88 | ;; | ||