mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-07-25 06:47:01 +00:00
Code Issues Projects Releases Wiki Activity

automake: upgrade from 1.11.2 to 1.11.3

Browse Source 
Removed already upstream patch:
  automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch

Rebased these patches to the newer code:
  automake/prefer-cpio-over-pax-for-ustar-archives.patch
  automake/python-libdir.patch

Changed the tarball name from bz2 to gz, as the bz2 tar ball
is not published for the 1.11.3 version.

[RP: Fix python.m4 to preserve the tweaks that allow us to build python modules]
(From OE-Core rev: 94bf72aeae035ffade75bd9343937888bbb09c82)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Nitin A Kamble
2012-03-16 12:00:03 -07:00
committed by Richard Purdie
parent 54a6f8498e
commit 9f17530dcc
5 changed files with 37 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/automake/automake/python-libdir.patch
+14 -12
View File
@@ -2,11 +2,11 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Index: automake-1.11.1/m4/python.m4
Index: automake-1.11.3/m4/python.m4
===================================================================
--- automake-1.11.1.orig/m4/python.m4
+++ automake-1.11.1/m4/python.m4
@@ -88,12 +88,13 @@ python2.1 python2.0])
--- automake-1.11.3.orig/m4/python.m4 2012-01-31 11:41:18.000000000 +0000
+++ automake-1.11.3/m4/python.m4 2012-04-24 10:04:57.726413598 +0000
@@ -92,12 +92,13 @@
[am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
@@ -22,16 +22,17 @@ Index: automake-1.11.1/m4/python.m4
AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
dnl At times (like when building shared libraries) you may want
@@ -122,7 +123,7 @@ python2.1 python2.0])
@@ -123,7 +124,8 @@
else
am_py_prefix=$prefix
fi
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 ||
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
- 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`
+ 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 ||
+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
case $am_cv_python_pythondir in
$am_py_prefix*)
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
@@ -132,7 +133,7 @@ python2.1 python2.0])
@@ -133,7 +135,7 @@
case $am_py_prefix in
/usr|/System*) ;;
*)
@@ -40,16 +41,17 @@ Index: automake-1.11.1/m4/python.m4
;;
esac
;;
@@ -160,7 +161,7 @@ python2.1 python2.0])
@@ -158,7 +160,8 @@
else
am_py_exec_prefix=$exec_prefix
fi
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 ||
- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
- 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`
+ 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 ||
+ echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
case $am_cv_python_pyexecdir in
$am_py_exec_prefix*)
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
@@ -170,7 +171,7 @@ python2.1 python2.0])
@@ -168,7 +171,7 @@
case $am_py_exec_prefix in
/usr|/System*) ;;
*)