diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-05-03 09:20:04 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-25 11:17:37 +0100 |
| commit | 45a57de50e14e42d202aef02030751b013f9eeb3 (patch) | |
| tree | e6b8b81498cec13e9e106af84c9fc7b67bf94694 | |
| parent | 64789e3d444df7f2fb8206d73427b27bdc7bae25 (diff) | |
| download | openembedded-core-45a57de50e14e42d202aef02030751b013f9eeb3.tar.gz openembedded-core-45a57de50e14e42d202aef02030751b013f9eeb3.tar.bz2 openembedded-core-45a57de50e14e42d202aef02030751b013f9eeb3.zip | |
libidn: fix build with automake 1.12
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
| -rw-r--r-- | meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-extended/libidn/libidn_1.24.bb | 5 |
2 files changed, 29 insertions, 2 deletions
diff --git a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch new file mode 100644 index 0000000000..20afd257be --- /dev/null +++ b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch @@ -0,0 +1,26 @@ +Upstream-Status: Pending + +This patch fixes following issue with automake 1.12 + +| automake: warnings are treated as errors +| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libidn.la': linking libtool libraries using a non-POSIX +| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac' + +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +2012/05/03 + +Index: libidn-1.24/configure.ac +=================================================================== +--- libidn-1.24.orig/configure.ac ++++ libidn-1.24/configure.ac +@@ -34,6 +34,10 @@ AC_SUBST(LT_CURRENT, 17) + AC_SUBST(LT_REVISION, 7) + AC_SUBST(LT_AGE, 6) + ++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it ++m4_pattern_allow([AM_PROG_AR]) ++AM_PROG_AR ++ + AC_PROG_CC + gl_EARLY + lgl_EARLY diff --git a/meta/recipes-extended/libidn/libidn_1.24.bb b/meta/recipes-extended/libidn/libidn_1.24.bb index 018f1181e5..c6ecea7c9b 100644 --- a/meta/recipes-extended/libidn/libidn_1.24.bb +++ b/meta/recipes-extended/libidn/libidn_1.24.bb @@ -10,11 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c9d9d207a3468a696a03368913d360b \ file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ file://lib/idna.h;endline=21;md5=7364f6a250728ffe16170f5e3ab37512 \ file://src/idn.c;endline=20;md5=7d7235e7951ac87d9dfac42e1b69d9cb" -PR = "r0" +PR = "r1" inherit pkgconfig autotools gettext -SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ + file://libidn_fix_for_automake-1.12.patch " SRC_URI[md5sum] = "764d7258eeb273941680499fab2c7367" SRC_URI[sha256sum] = "da1708c6063ecb7951a0908e67df3eacdfe128b18edaa6cf6867d7b73b5f35ff" |