[PATCH 0/3] more automake 1.12.x related fixes

[PATCH 0/3] more automake 1.12.x related fixes

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

nongplv3 & commercial licence recipe testing revelaed more issue, and the fixes
for these are here.
Thanks,
Nitin

The following changes since commit 581d9dc2d148b67332a255cc1e7ce0679ff82c23:

  tar: fix build with automake 1.12.x (2012-07-12 21:13:42 -0700)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib nitin/automake_update_on_master
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/automake_update_on_master

Nitin A Kamble (3):
  gawk-3.1.5: fix build with automake 1.12.x
  sed-4.1.2: fix build with automake 1.12.x
  lame: fix build with automake 1.12.x

 ...atch => gawk-3.1.5_fix_for_automake-1.12.patch} |    0
 meta/recipes-extended/gawk/gawk_3.1.5.bb           |    5 +-
 .../sed-4.1.2_fix_for_automake-1.12.patch          |   37 ++++++++++++
 meta/recipes-extended/sed/sed_4.1.2.bb             |    5 +-
 .../lame/lame-3.99.5_fix_for_automake-1.12.x.patch |   59 ++++++++++++++++++++
 meta/recipes-multimedia/lame/lame_3.99.5.bb        |   14 +----
 6 files changed, 105 insertions(+), 15 deletions(-)
 rename meta/recipes-extended/gawk/gawk-3.1.5/{gawk_fix_for_automake-1.12.patch => gawk-3.1.5_fix_for_automake-1.12.patch} (100%)
 create mode 100644 meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch
 create mode 100644 meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch

-- 
1.7.3.4

[PATCH 1/3] gawk-3.1.5: fix build with automake 1.12.x

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Add the gawk-3.1.5_fix_for_automake-1.12.patch in SRC_URI.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 ...atch => gawk-3.1.5_fix_for_automake-1.12.patch} |    0
 meta/recipes-extended/gawk/gawk_3.1.5.bb           |    5 +++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/gawk/gawk-3.1.5/{gawk_fix_for_automake-1.12.patch => gawk-3.1.5_fix_for_automake-1.12.patch} (100%)

diff --git a/meta/recipes-extended/gawk/gawk-3.1.5/gawk_fix_for_automake-1.12.patch b/meta/recipes-extended/gawk/gawk-3.1.5/gawk-3.1.5_fix_for_automake-1.12.patch
similarity index 100%
rename from meta/recipes-extended/gawk/gawk-3.1.5/gawk_fix_for_automake-1.12.patch
rename to meta/recipes-extended/gawk/gawk-3.1.5/gawk-3.1.5_fix_for_automake-1.12.patch
diff --git a/meta/recipes-extended/gawk/gawk_3.1.5.bb b/meta/recipes-extended/gawk/gawk_3.1.5.bb
index 4c7cdf3..89dd01c 100644
--- a/meta/recipes-extended/gawk/gawk_3.1.5.bb
+++ b/meta/recipes-extended/gawk/gawk_3.1.5.bb
@@ -13,9 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 RDEPENDS_gawk += "gawk-common"
 RDEPENDS_pgawk += "gawk-common"
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
+	file://gawk-3.1.5_fix_for_automake-1.12.patch"
 
 SRC_URI[md5sum] = "4760325489479cac17fe0114b8f62f30"
 SRC_URI[sha256sum] = "463dcb9d0ca398b1d4f5a332f6cd9cec56441265fca616f2ea1b44d459e9f0f8"
-- 
1.7.3.4

[PATCH 2/3] sed-4.1.2: fix build with automake 1.12.x

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

automake has depricated use of @mkdir_p@, Fix the
issue by using @MKDIR_P@ instead.

added a new patch:
   sed-4.1.2_fix_for_automake-1.12.patch

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../sed-4.1.2_fix_for_automake-1.12.patch          |   37 ++++++++++++++++++++
 meta/recipes-extended/sed/sed_4.1.2.bb             |    5 ++-
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch

diff --git a/meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch b/meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch
new file mode 100644
index 0000000..8059406
--- /dev/null
+++ b/meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch
@@ -0,0 +1,37 @@
+Upstream-Status: Pending
+
+automake-1.12.x has deprecated use of @mkdir_p@, fix the issue by using @MKDIR_P@ instead.
+
+Avoid this build issue:
+| make[1]: mkdir_p@: Command not found
+| make[1]: *** [install-data-yes] Error 127
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/07/13
+
+Index: sed-4.1.2/intl/Makefile.in
+===================================================================
+--- sed-4.1.2.orig/intl/Makefile.in
++++ sed-4.1.2/intl/Makefile.in
+@@ -40,7 +40,7 @@ subdir = intl
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ mkinstalldirs = $(mkdir_p)
+-mkdir_p = @mkdir_p@
++mkdir_p = @MKDIR_P@
+ 
+ l = @INTL_LIBTOOL_SUFFIX_PREFIX@
+ 
+Index: sed-4.1.2/po/Makefile.in.in
+===================================================================
+--- sed-4.1.2.orig/po/Makefile.in.in
++++ sed-4.1.2/po/Makefile.in.in
+@@ -29,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po
+ INSTALL = /srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/bin/install -c
+ INSTALL_DATA = ${INSTALL} -m 644
+ mkinstalldirs = $(mkdir_p)
+-mkdir_p = @mkdir_p@
++mkdir_p = @MKDIR_P@
+ 
+ CC = i586-poky-linux-gcc  -m32   -march=i586 --sysroot=/srv/home/nitin/builds2/build0/tmp/sysroots/qemux86
+ GMSGFMT = /srv/home/nitin/builds2/build0/tmp/sysroots/x86_64-linux/usr/bin/msgfmt
diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb
index ca22736..3455c20 100644
--- a/meta/recipes-extended/sed/sed_4.1.2.bb
+++ b/meta/recipes-extended/sed/sed_4.1.2.bb
@@ -4,10 +4,11 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://sed/sed.h;beginline=1;endline=17;md5=e00ffd1837f298439a214fd197f6a407"
 SECTION = "console/utils"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \
-           file://fix_return_type.patch"
+           file://fix_return_type.patch \
+           file://sed-4.1.2_fix_for_automake-1.12.patch "
 
 SRC_URI[md5sum] = "928f0e06422f414091917401f1a834d0"
 SRC_URI[sha256sum] = "638e837ba765d5da0a30c98b57c2953cecea96827882f594612acace93ceeeab"
-- 
1.7.3.4

[PATCH 3/3] lame: fix build with automake 1.12.x

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

automake 1.12.x has deprecated automatic de-ANSI-fication support.
Fix sources to work with automake 1.12.x

Added a new patch:
   lame-3.99.5_fix_for_automake-1.12.x.patch

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 .../lame/lame-3.99.5_fix_for_automake-1.12.x.patch |   59 ++++++++++++++++++++
 meta/recipes-multimedia/lame/lame_3.99.5.bb        |   14 +----
 2 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100644 meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch

diff --git a/meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch b/meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch
new file mode 100644
index 0000000..571a1d0
--- /dev/null
+++ b/meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch
@@ -0,0 +1,59 @@
+Upstream-Status: Pending
+
+Fix this kind of errors with automake 1.12.x:
+| doc/man/Makefile.am:3: error: automatic de-ANSI-fication support has been removed
+| autoreconf: automake failed with exit status: 1
+
+Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/07/13
+
+Index: lame-3.99.5/configure.in
+===================================================================
+--- lame-3.99.5.orig/configure.in
++++ lame-3.99.5/configure.in
+@@ -77,9 +77,6 @@ if test "${GCC}" = "yes"; then
+ 	AC_MSG_RESULT(${GCC_version})
+ fi
+ 
+-dnl more automake stuff
+-AM_C_PROTOTYPES
+-
+ AC_CHECK_HEADER(dmalloc.h)
+ if test "${ac_cv_header_dmalloc_h}" = "yes"; then
+ 	AM_WITH_DMALLOC
+Index: lame-3.99.5/doc/html/Makefile.am
+===================================================================
+--- lame-3.99.5.orig/doc/html/Makefile.am
++++ lame-3.99.5/doc/html/Makefile.am
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ docdir = $(datadir)/doc
+ pkgdocdir = $(docdir)/$(PACKAGE)
+Index: lame-3.99.5/libmp3lame/i386/Makefile.am
+===================================================================
+--- lame-3.99.5.orig/libmp3lame/i386/Makefile.am
++++ lame-3.99.5/libmp3lame/i386/Makefile.am
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ DEFS = @DEFS@ @CONFIG_DEFS@
+ 
+Index: lame-3.99.5/doc/man/Makefile.am
+===================================================================
+--- lame-3.99.5.orig/doc/man/Makefile.am
++++ lame-3.99.5/doc/man/Makefile.am
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ man_MANS = lame.1
+ EXTRA_DIST = ${man_MANS}
diff --git a/meta/recipes-multimedia/lame/lame_3.99.5.bb b/meta/recipes-multimedia/lame/lame_3.99.5.bb
index a0c4cf5..764fcc1 100644
--- a/meta/recipes-multimedia/lame/lame_3.99.5.bb
+++ b/meta/recipes-multimedia/lame/lame_3.99.5.bb
@@ -8,10 +8,11 @@ LICENSE_FLAGS = "commercial"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \
                     file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b \
 "
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
-           file://no-gtk1.patch"
+           file://no-gtk1.patch \
+           file://lame-3.99.5_fix_for_automake-1.12.x.patch "
 
 SRC_URI[md5sum] = "84835b313d4a8b68f5349816d33e07ce"
 SRC_URI[sha256sum] = "24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff"
@@ -23,12 +24,3 @@ FILES_${PN} = "${bindir}/lame"
 FILES_libmp3lame = "${libdir}/libmp3lame.so.*"
 FILES_libmp3lame-dev = "${includedir} ${libdir}/*"
 FILES_${PN}-dev = ""
-
-do_configure() {
-	# no autoreconf please
-	aclocal
-	autoconf
-	libtoolize --force
-	gnu-configize --force
-	oe_runconf
-}
-- 
1.7.3.4

Re: [PATCH 0/3] more automake 1.12.x related fixes

[Saul Wold]

On 07/13/2012 01:12 AM, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
>
> nongplv3 & commercial licence recipe testing revelaed more issue, and the fixes
> for these are here.
> Thanks,
> Nitin
>
> The following changes since commit 581d9dc2d148b67332a255cc1e7ce0679ff82c23:
>
>    tar: fix build with automake 1.12.x (2012-07-12 21:13:42 -0700)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib nitin/automake_update_on_master
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/automake_update_on_master
>
> Nitin A Kamble (3):
>    gawk-3.1.5: fix build with automake 1.12.x
>    sed-4.1.2: fix build with automake 1.12.x
>    lame: fix build with automake 1.12.x
>
>   ...atch => gawk-3.1.5_fix_for_automake-1.12.patch} |    0
>   meta/recipes-extended/gawk/gawk_3.1.5.bb           |    5 +-
>   .../sed-4.1.2_fix_for_automake-1.12.patch          |   37 ++++++++++++
>   meta/recipes-extended/sed/sed_4.1.2.bb             |    5 +-
>   .../lame/lame-3.99.5_fix_for_automake-1.12.x.patch |   59 ++++++++++++++++++++
>   meta/recipes-multimedia/lame/lame_3.99.5.bb        |   14 +----
>   6 files changed, 105 insertions(+), 15 deletions(-)
>   rename meta/recipes-extended/gawk/gawk-3.1.5/{gawk_fix_for_automake-1.12.patch => gawk-3.1.5_fix_for_automake-1.12.patch} (100%)
>   create mode 100644 meta/recipes-extended/sed/sed-4.1.2/sed-4.1.2_fix_for_automake-1.12.patch
>   create mode 100644 meta/recipes-multimedia/lame/lame/lame-3.99.5_fix_for_automake-1.12.x.patch
>

Merged this set into OE-Core

Thanks
	Sau!