summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-08-11 01:26:33 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-12 17:21:54 +0100
commit7449a372ebbc7d27f0e067754c4c0748d15f4ede (patch)
treee4857c64d352bbd8902ba2905093def132c88dd2 /meta
parent577a9145124582de7c4288dffe993eb7a3459162 (diff)
downloadpoky-7449a372ebbc7d27f0e067754c4c0748d15f4ede.tar.gz
automake: Update for python.m4 to respect libdir
As we tweak libdir we need python libs that utilize configure to respect it setting. By updating the python.m4 template, when we regen automake files they will than respect the setting of libdir which is standard for any autotools based recipe. (From OE-Core rev: d300cfe603b00fc963f7ed874563016fcbcc47a8) Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/automake/automake.inc2
-rw-r--r--meta/recipes-devtools/automake/automake/python-libdir.patch60
-rw-r--r--meta/recipes-devtools/automake/automake_1.11.1.bb3
3 files changed, 63 insertions, 2 deletions
diff --git a/meta/recipes-devtools/automake/automake.inc b/meta/recipes-devtools/automake/automake.inc
index 96d797f914..f217e1432b 100644
--- a/meta/recipes-devtools/automake/automake.inc
+++ b/meta/recipes-devtools/automake/automake.inc
@@ -4,7 +4,7 @@ Standards. Automake requires the use of Autoconf."
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5HOMEPAGE = "http://www.gnu.org/software/automake/" 5HOMEPAGE = "http://www.gnu.org/software/automake/"
6SECTION = "devel" 6SECTION = "devel"
7PR = "r3" 7PR = "r4"
8 8
9SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 " 9SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
10 10
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch
new file mode 100644
index 0000000000..63dafca012
--- /dev/null
+++ b/meta/recipes-devtools/automake/automake/python-libdir.patch
@@ -0,0 +1,60 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
4
5Index: automake-1.11.1/m4/python.m4
6===================================================================
7--- automake-1.11.1.orig/m4/python.m4
8+++ automake-1.11.1/m4/python.m4
9@@ -88,12 +88,13 @@ python2.1 python2.0])
10 [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
11 AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
12
13- dnl Use the values of $prefix and $exec_prefix for the corresponding
14- dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
15+ dnl Use the values of $prefix, $libdir and $exec_prefix for the corresponding
16+ dnl values of PYTHON_PREFIX PYTHON_LIB_PREFIX, and PYTHON_EXEC_PREFIX. These are made
17 dnl distinct variables so they can be overridden if need be. However,
18 dnl general consensus is that you shouldn't need this ability.
19
20 AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
21+ AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}'])
22 AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
23
24 dnl At times (like when building shared libraries) you may want
25@@ -122,7 +123,7 @@ python2.1 python2.0])
26 am_py_prefix=$prefix
27 fi
28 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 ||
29- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
30+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
31 case $am_cv_python_pythondir in
32 $am_py_prefix*)
33 am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
34@@ -132,7 +133,7 @@ python2.1 python2.0])
35 case $am_py_prefix in
36 /usr|/System*) ;;
37 *)
38- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
39+ am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages
40 ;;
41 esac
42 ;;
43@@ -160,7 +161,7 @@ python2.1 python2.0])
44 am_py_exec_prefix=$exec_prefix
45 fi
46 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 ||
47- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
48+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
49 case $am_cv_python_pyexecdir in
50 $am_py_exec_prefix*)
51 am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
52@@ -170,7 +171,7 @@ python2.1 python2.0])
53 case $am_py_exec_prefix in
54 /usr|/System*) ;;
55 *)
56- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
57+ am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages
58 ;;
59 esac
60 ;;
diff --git a/meta/recipes-devtools/automake/automake_1.11.1.bb b/meta/recipes-devtools/automake/automake_1.11.1.bb
index c66155fe21..fee9597729 100644
--- a/meta/recipes-devtools/automake/automake_1.11.1.bb
+++ b/meta/recipes-devtools/automake/automake_1.11.1.bb
@@ -33,7 +33,8 @@ PATHFIXPATCH = "file://path_prog_fixes.patch;patch=1"
33PATHFIXPATCH_virtclass-native = "" 33PATHFIXPATCH_virtclass-native = ""
34 34
35SRC_URI += "${PATHFIXPATCH} \ 35SRC_URI += "${PATHFIXPATCH} \
36 file://prefer-cpio-over-pax-for-ustar-archives.patch" 36 file://prefer-cpio-over-pax-for-ustar-archives.patch \
37 file://python-libdir.patch"
37 38
38SRC_URI[md5sum] = "c2972c4d9b3e29c03d5f2af86249876f" 39SRC_URI[md5sum] = "c2972c4d9b3e29c03d5f2af86249876f"
39SRC_URI[sha256sum] = "5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae" 40SRC_URI[sha256sum] = "5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae"