aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/popt
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-05-02 16:43:33 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 11:17:36 +0100
commit1bf680a5e8015e6245369aa23b21312c81c507cb (patch)
tree35eb0b78a313db84b9f118b7dddddac9aef02737 /meta/recipes-support/popt
parent000bfb7961ad106a93be8fc98118c533bd6b690d (diff)
downloadopenembedded-core-1bf680a5e8015e6245369aa23b21312c81c507cb.tar.gz
openembedded-core-1bf680a5e8015e6245369aa23b21312c81c507cb.tar.bz2
openembedded-core-1bf680a5e8015e6245369aa23b21312c81c507cb.zip
popt: fix build with automake 1.12
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-support/popt')
-rw-r--r--meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch21
-rw-r--r--meta/recipes-support/popt/popt_1.16.bb3
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch b/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch
new file mode 100644
index 0000000000..91bca96a50
--- /dev/null
+++ b/meta/recipes-support/popt/popt/popt_fix_for_automake-1.12.patch
@@ -0,0 +1,21 @@
+Upstream-Status: pending
+
+This patch avoids this error with automake 1.12:
+
+| configure.ac:49: error: automatic de-ANSI-fication support has been removed
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/05/02
+
+Index: popt-1.16/configure.ac
+===================================================================
+--- popt-1.16.orig/configure.ac
++++ popt-1.16/configure.ac
+@@ -46,7 +46,6 @@ AC_GCC_TRADITIONAL
+ AC_SYS_LARGEFILE
+
+ AC_ISC_POSIX
+-AM_C_PROTOTYPES
+
+ AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
+
diff --git a/meta/recipes-support/popt/popt_1.16.bb b/meta/recipes-support/popt/popt_1.16.bb
index cd22e9a77c..91b0d60857 100644
--- a/meta/recipes-support/popt/popt_1.16.bb
+++ b/meta/recipes-support/popt/popt_1.16.bb
@@ -4,10 +4,11 @@ SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \
file://pkgconfig_fix.patch \
+ file://popt_fix_for_automake-1.12.patch \
"
SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33"