automake: update to upstream version 1.12.6

python-libdir.patch and py-compile-only-optimized-byte-code.patch
updated to apply to new codebase.

(From OE-Core rev: f2a530be5941ddf708720b920d0213d7d3928cd1)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 38 insertions, 35 deletions

diff --git a/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch b/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch
index f09bfbca5d..f8334a7212 100644
--- a/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch
+++ b/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch
@@ -5,20 +5,20 @@ Upstream-Status: Inappropriate [embedded specific]
   pyc files by automake.
 
 Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- lib/py-compile |   17 -----------------
- 1 files changed, 0 insertions(+), 17 deletions(-)
 
-diff --git a/lib/py-compile b/lib/py-compile
-index 3f9d05b..101c814 100755
---- a/lib/py-compile
-+++ b/lib/py-compile
-@@ -101,23 +101,6 @@ else
+Updated for automake-1.12.6
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+
+diff -Nurd automake-1.12.6/lib/py-compile automake-1.12.6/lib/py-compile
+--- automake-1.12.6/lib/py-compile      2012-12-13 21:57:31.000000000 +0200
++++ automake-1.12.6/lib/py-compile      2012-12-27 19:34:01.426015140 +0200
+@@ -115,26 +115,6 @@
      filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
  fi
  
 -$PYTHON -c "
--import sys, os, py_compile
+-import sys, os, py_compile, imp
 -
 -files = '''$files'''
 -
@@ -31,12 +31,12 @@ index 3f9d05b..101c814 100755
 -           continue
 -    sys.stdout.write(file)
 -    sys.stdout.flush()
--    py_compile.compile(filepath, filepath + 'c', path)
+-    if hasattr(imp, 'get_tag'):
+-        py_compile.compile(filepath, imp.cache_from_source(filepath), path)
+-    else:
+-        py_compile.compile(filepath, filepath + 'c', path)
 -sys.stdout.write('\n')" || exit $?
 -
  # this will fail for python < 1.5, but that doesn't matter ...
  $PYTHON -O -c "
- import sys, os, py_compile
--- 
-1.7.0.4
-
+ import sys, os, py_compile, imp
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch
index 0783600588..47541bdedc 100644
--- a/meta/recipes-devtools/automake/automake/python-libdir.patch
+++ b/meta/recipes-devtools/automake/automake/python-libdir.patch
@@ -2,11 +2,14 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
 
-Index: automake-1.11.3/m4/python.m4
-===================================================================
---- 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 @@
+Updated for automake-1.12.6
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+
+diff -Nurd automake-1.12.6/m4/python.m4 automake-1.12.6/m4/python.m4
+--- automake-1.12.6/m4/python.m4        2012-12-13 22:02:25.000000000 +0200
++++ automake-1.12.6/m4/python.m4        2012-12-27 17:40:26.558164660 +0200
+@@ -91,12 +91,13 @@
      [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
    AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
  
@@ -22,17 +25,17 @@ Index: automake-1.11.3/m4/python.m4
    AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
  
    dnl At times (like when building shared libraries) you may want
-@@ -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`
-+     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 ||
+@@ -148,7 +149,8 @@
+ else:
+     from distutils import sysconfig
+     sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+-sys.stdout.write(sitedir)"`
++sys.stdout.write(sitedir)" ||
 +     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'`
-@@ -133,7 +135,7 @@
+@@ -158,7 +160,7 @@
         case $am_py_prefix in
           /usr|/System*) ;;
           *)
@@ -41,17 +44,17 @@ Index: automake-1.11.3/m4/python.m4
           ;;
         esac
         ;;
-@@ -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`
-+     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 ||
+@@ -190,7 +192,8 @@
+ else:
+     from distutils import sysconfig
+     sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+-sys.stdout.write(sitedir)"`
++sys.stdout.write(sitedir)" ||
 +     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'`
-@@ -168,7 +171,7 @@
+@@ -200,7 +203,7 @@
         case $am_py_exec_prefix in
           /usr|/System*) ;;
           *)
diff --git a/meta/recipes-devtools/automake/automake_1.12.5.bb b/meta/recipes-devtools/automake/automake_1.12.6.bb
index c68167483a..59bbdd8bfd 100644
--- a/meta/recipes-devtools/automake/automake_1.12.5.bb
+++ b/meta/recipes-devtools/automake/automake_1.12.6.bb
@@ -26,8 +26,8 @@ SRC_URI += "${PATHFIXPATCH} \
             file://py-compile-compile-only-optimized-byte-code.patch \
             file://buildtest.patch"
 
-SRC_URI[md5sum] = "674f6d28f8723e0f478cb03de30f36f1"
-SRC_URI[sha256sum] = "82089e23b384d3e64efa4f09f133a02dadb91c0593d4f1d4e12c29d806be9925"
+SRC_URI[md5sum] = "199d39ece2e6070d64ac20d45ac86026"
+SRC_URI[sha256sum] = "0cbe570db487908e70af7119da85ba04f7e28656b26f717df0265ae08defd9ef"
 
 PR = "r0"