From 2d0c20a39be017e93303c7e7f9c11f32f737372d Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Thu, 12 Jul 2012 22:03:27 -0700 Subject: gawk-3.1.5: fix build with automake 1.12.x Add the gawk-3.1.5_fix_for_automake-1.12.patch in SRC_URI. Signed-off-by: Nitin A Kamble Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../gawk-3.1.5_fix_for_automake-1.12.patch | 41 ++++++++++++++++++++++ .../gawk-3.1.5/gawk_fix_for_automake-1.12.patch | 41 ---------------------- meta/recipes-extended/gawk/gawk_3.1.5.bb | 5 +-- 3 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 meta/recipes-extended/gawk/gawk-3.1.5/gawk-3.1.5_fix_for_automake-1.12.patch delete mode 100644 meta/recipes-extended/gawk/gawk-3.1.5/gawk_fix_for_automake-1.12.patch (limited to 'meta/recipes-extended/gawk') diff --git a/meta/recipes-extended/gawk/gawk-3.1.5/gawk-3.1.5_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 new file mode 100644 index 0000000000..b3e7987cef --- /dev/null +++ b/meta/recipes-extended/gawk/gawk-3.1.5/gawk-3.1.5_fix_for_automake-1.12.patch @@ -0,0 +1,41 @@ +Upstream-Status: Pending + +automake 1.12 has depricated automatic de-ANSI-fication support + +this patch avoids these kinds of errors: + +| configure.ac:127: error: automatic de-ANSI-fication support has been removed +| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/aclocal-1.12/protos.m4:12: AM_C_PROTOTYPES is expanded from... +| configure.ac:127: the top level +| autom4te: m4 failed with exit status: 1 +... +| Makefile.am:27: error: automatic de-ANSI-fication support has been removed + +Signed-Off-By: Nitin A Kamble +2012/05/04 + +Index: gawk-3.1.5/configure.ac +=================================================================== +--- gawk-3.1.5.orig/configure.ac ++++ gawk-3.1.5/configure.ac +@@ -124,7 +124,6 @@ fi + + dnl check for C compiler for automake + AM_PROG_CC_STDC +-AM_C_PROTOTYPES + + dnl Cygwin doesn't like to get libs with full paths + dnl since that overrides linking against DLLs. +Index: gawk-3.1.5/Makefile.am +=================================================================== +--- gawk-3.1.5.orig/Makefile.am ++++ gawk-3.1.5/Makefile.am +@@ -24,7 +24,7 @@ + ## process this file with automake to produce Makefile.in + + # Automatic de-ANSI-fication if needed, make .bz2 files also. +-AUTOMAKE_OPTIONS = ansi2knr dist-bzip2 ++AUTOMAKE_OPTIONS = dist-bzip2 + + # This undocumented variable insures that aclocal runs + # correctly after changing configure.ac 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_fix_for_automake-1.12.patch deleted file mode 100644 index b3e7987cef..0000000000 --- a/meta/recipes-extended/gawk/gawk-3.1.5/gawk_fix_for_automake-1.12.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Pending - -automake 1.12 has depricated automatic de-ANSI-fication support - -this patch avoids these kinds of errors: - -| configure.ac:127: error: automatic de-ANSI-fication support has been removed -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/aclocal-1.12/protos.m4:12: AM_C_PROTOTYPES is expanded from... -| configure.ac:127: the top level -| autom4te: m4 failed with exit status: 1 -... -| Makefile.am:27: error: automatic de-ANSI-fication support has been removed - -Signed-Off-By: Nitin A Kamble -2012/05/04 - -Index: gawk-3.1.5/configure.ac -=================================================================== ---- gawk-3.1.5.orig/configure.ac -+++ gawk-3.1.5/configure.ac -@@ -124,7 +124,6 @@ fi - - dnl check for C compiler for automake - AM_PROG_CC_STDC --AM_C_PROTOTYPES - - dnl Cygwin doesn't like to get libs with full paths - dnl since that overrides linking against DLLs. -Index: gawk-3.1.5/Makefile.am -=================================================================== ---- gawk-3.1.5.orig/Makefile.am -+++ gawk-3.1.5/Makefile.am -@@ -24,7 +24,7 @@ - ## process this file with automake to produce Makefile.in - - # Automatic de-ANSI-fication if needed, make .bz2 files also. --AUTOMAKE_OPTIONS = ansi2knr dist-bzip2 -+AUTOMAKE_OPTIONS = dist-bzip2 - - # This undocumented variable insures that aclocal runs - # correctly after changing configure.ac diff --git a/meta/recipes-extended/gawk/gawk_3.1.5.bb b/meta/recipes-extended/gawk/gawk_3.1.5.bb index 4c7cdf36b1..89dd01ce7f 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" -- cgit 1.2.3-korg