libidn: fix build with automake 1.12

(From OE-Core rev: 45a57de50e14e42d202aef02030751b013f9eeb3)

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-03 09:20:04 -07:00
committed by Richard Purdie
parent 8d63ffe927
commit 625d9745b9
2 changed files with 29 additions and 2 deletions

View File

@@ -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

View File

@@ -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"