summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-05-03 09:20:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 11:17:58 +0100
commit625d9745b920e7f7b5e5b4572e440406d983d673 (patch)
tree10c56af3cefe8c6817432b398440ae8bff3d31cf /meta/recipes-extended
parent8d63ffe927b1cdcd533addcd50ef3d9b8c9f272f (diff)
downloadpoky-625d9745b920e7f7b5e5b4572e440406d983d673.tar.gz
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>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch26
-rw-r--r--meta/recipes-extended/libidn/libidn_1.24.bb5
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 @@
1Upstream-Status: Pending
2
3This patch fixes following issue with automake 1.12
4
5| automake: warnings are treated as errors
6| /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
7| /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'
8
9Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
102012/05/03
11
12Index: libidn-1.24/configure.ac
13===================================================================
14--- libidn-1.24.orig/configure.ac
15+++ libidn-1.24/configure.ac
16@@ -34,6 +34,10 @@ AC_SUBST(LT_CURRENT, 17)
17 AC_SUBST(LT_REVISION, 7)
18 AC_SUBST(LT_AGE, 6)
19
20+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
21+m4_pattern_allow([AM_PROG_AR])
22+AM_PROG_AR
23+
24 AC_PROG_CC
25 gl_EARLY
26 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 \
10 file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ 10 file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://lib/idna.h;endline=21;md5=7364f6a250728ffe16170f5e3ab37512 \ 11 file://lib/idna.h;endline=21;md5=7364f6a250728ffe16170f5e3ab37512 \
12 file://src/idn.c;endline=20;md5=7d7235e7951ac87d9dfac42e1b69d9cb" 12 file://src/idn.c;endline=20;md5=7d7235e7951ac87d9dfac42e1b69d9cb"
13PR = "r0" 13PR = "r1"
14 14
15inherit pkgconfig autotools gettext 15inherit pkgconfig autotools gettext
16 16
17SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz" 17SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
18 file://libidn_fix_for_automake-1.12.patch "
18 19
19SRC_URI[md5sum] = "764d7258eeb273941680499fab2c7367" 20SRC_URI[md5sum] = "764d7258eeb273941680499fab2c7367"
20SRC_URI[sha256sum] = "da1708c6063ecb7951a0908e67df3eacdfe128b18edaa6cf6867d7b73b5f35ff" 21SRC_URI[sha256sum] = "da1708c6063ecb7951a0908e67df3eacdfe128b18edaa6cf6867d7b73b5f35ff"