summaryrefslogtreecommitdiffstats
path: root/meta
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:56 +0100
commit8512519bb2b7b6bfa03c1be591240a9fc886c280 (patch)
treeb509c80a22b45316a89c0b055f28bba89b51986a /meta
parent05fe6c0ab908e5d471e45f8fa9e2bb881d745f1b (diff)
downloadpoky-8512519bb2b7b6bfa03c1be591240a9fc886c280.tar.gz
popt: fix build with automake 1.12
(From OE-Core rev: 1bf680a5e8015e6245369aa23b21312c81c507cb) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 @@
1Upstream-Status: pending
2
3This patch avoids this error with automake 1.12:
4
5| configure.ac:49: error: automatic de-ANSI-fication support has been removed
6
7Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
82012/05/02
9
10Index: popt-1.16/configure.ac
11===================================================================
12--- popt-1.16.orig/configure.ac
13+++ popt-1.16/configure.ac
14@@ -46,7 +46,6 @@ AC_GCC_TRADITIONAL
15 AC_SYS_LARGEFILE
16
17 AC_ISC_POSIX
18-AM_C_PROTOTYPES
19
20 AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
21
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"
4 4
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d" 6LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d"
7PR = "r1" 7PR = "r2"
8 8
9SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \ 9SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \
10 file://pkgconfig_fix.patch \ 10 file://pkgconfig_fix.patch \
11 file://popt_fix_for_automake-1.12.patch \
11 " 12 "
12 13
13SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33" 14SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33"