sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

grep-2.5.1a: fix build with automake 1.12 

(From OE-Core rev: addd517f17c4595fe03d9d5f0ad1d7daf86a3f39)

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-05-04 12:01:28 -07:00 committed by Richard Purdie
parent 8939db4709
commit 58954a155e
2 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
meta/recipes-extended/grep/grep-2.5.1a/grep_fix_for_automake-1.12.patch Normal file
View File

@ -0,0 +1,52 @@
Upstream-Status: Pending
automake 1.12 has depricated automatic de-ANSI-fication support
this patch avoids these kinds of errors:
| configure.in:33: 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.in:33: the top level
| autom4te: m4 failed with exit status: 1
...
| lib/Makefile.am:2: error: automatic de-ANSI-fication support has been removed
| src/Makefile.am:2: 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/05/04
Index: grep-2.5.1a/configure.in
===================================================================
--- grep-2.5.1a.orig/configure.in
+++ grep-2.5.1a/configure.in
@@ -30,7 +30,6 @@ AC_PROG_RANLIB
dnl Checks for typedefs, structures, and compiler characteristics.
AC_SYS_LARGEFILE
-AM_C_PROTOTYPES
AC_TYPE_SIZE_T
AC_CHECK_TYPE(ssize_t, int)
AC_C_CONST
Index: grep-2.5.1a/lib/Makefile.am
===================================================================
--- grep-2.5.1a.orig/lib/Makefile.am
+++ grep-2.5.1a/lib/Makefile.am
@@ -1,5 +1,5 @@
#
-AUTOMAKE_OPTIONS = ../src/ansi2knr
+AUTOMAKE_OPTIONS =
SUBDIRS = posix
Index: grep-2.5.1a/src/Makefile.am
===================================================================
--- grep-2.5.1a.orig/src/Makefile.am
+++ grep-2.5.1a/src/Makefile.am
@@ -1,5 +1,5 @@
## Process this file with automake to create Makefile.in
-AUTOMAKE_OPTIONS = ansi2knr no-dependencies
+AUTOMAKE_OPTIONS = no-dependencies
LN = ln

7
meta/recipes-extended/grep/grep_2.5.1a.bb
View File

@ -5,10 +5,12 @@ SECTION = "console/utils"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
PR = "r1"
PR = "r2"
SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
file://uclibc-fix.patch"
file://uclibc-fix.patch \
file://grep_fix_for_automake-1.12.patch \
"
SRC_URI[md5sum] = "52202fe462770fa6be1bb667bd6cf30c"
SRC_URI[sha256sum] = "38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132"
@ -17,6 +19,7 @@ inherit autotools gettext
EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses"
CFLAGS += "-D PROTOTYPES"
do_configure_prepend () {
rm -f ${S}/m4/init.m4
}