From patchwork Fri May 25 06:42:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Consolidated,Pull,36/45] make-3.81: fix build with automake 1.12 Date: Fri, 25 May 2012 06:42:15 -0000 From: Saul Wold X-Patchwork-Id: 28793 Message-Id: <94c98aff24e8e04c1963722249d2ddcb6e042687.1337927956.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Nitin A Kamble Signed-off-by: Nitin A Kamble --- .../make-3.81/make_fix_for_automake-1.12.patch | 43 ++++++++++++++++++++ meta/recipes-devtools/make/make_3.81.bb | 4 +- 2 files changed, 46 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch diff --git a/meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch b/meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch new file mode 100644 index 0000000..9b2e964 --- /dev/null +++ b/meta/recipes-devtools/make/make-3.81/make_fix_for_automake-1.12.patch @@ -0,0 +1,43 @@ +Upstream-Status: Pending + +automake 1.12 has depricated automatic de-ANSI-fication support + +this patch avoids these kinds of errors: + +| configure.in:48: error: automatic de-ANSI-fication support has been removed +... +| Makefile.am:19: error: automatic de-ANSI-fication support has been removed +| autoreconf: automake failed with exit status: 1 +| ERROR: autoreconf execution failed. + + +Signed-Off-By: Nitin A Kamble +2012/05/04 + +Index: make-3.81/configure.in +=================================================================== +--- make-3.81.orig/configure.in ++++ make-3.81/configure.in +@@ -44,9 +44,6 @@ AC_AIX + AC_ISC_POSIX + AC_MINIX + +-# Needed for ansi2knr +-AM_C_PROTOTYPES +- + # Enable gettext, in "external" mode. + + AM_GNU_GETTEXT_VERSION(0.14.1) +Index: make-3.81/Makefile.am +=================================================================== +--- make-3.81.orig/Makefile.am ++++ make-3.81/Makefile.am +@@ -16,7 +16,7 @@ + # GNU Make; see the file COPYING. If not, write to the Free Software + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + +-AUTOMAKE_OPTIONS = 1.8 dist-bzip2 check-news ansi2knr ++AUTOMAKE_OPTIONS = 1.8 dist-bzip2 check-news + ACLOCAL_AMFLAGS = -I config + + MAKE_HOST = @MAKE_HOST@ diff --git a/meta/recipes-devtools/make/make_3.81.bb b/meta/recipes-devtools/make/make_3.81.bb index 9458c39..45ab6ca 100644 --- a/meta/recipes-devtools/make/make_3.81.bb +++ b/meta/recipes-devtools/make/make_3.81.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" LICENSE = "GPLv2 & LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \ @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \ require make.inc +SRC_URI += "file://make_fix_for_automake-1.12.patch" + SRC_URI[md5sum] = "354853e0b2da90c527e35aabb8d6f1e6" SRC_URI[sha256sum] = "f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8"