summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2013-01-27 23:39:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-28 12:43:41 (GMT)
commitf49e7629dfd278de10a3243a40bddb265de1e98c (patch)
tree1d94bf0356484d5cf121741588cf57ed5e96a42e
parente124ac50dc3f55878fefc436c7b157b2a2c291fc (diff)
downloadpoky-f49e7629dfd278de10a3243a40bddb265de1e98c.tar.gz
libtasn1: fix build with automake 1.12
(From OE-Core rev: 6fb4913eb237062303bcda50e9910f53dc95d0dd) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch28
-rw-r--r--meta/recipes-support/gnutls/libtasn1_2.12.bb6
2 files changed, 32 insertions, 2 deletions
diff --git a/meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch b/meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch
new file mode 100644
index 0000000..5540bef
--- /dev/null
+++ b/meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch
@@ -0,0 +1,28 @@
1Upstream-Status: Pending
2
3This patch avoids following issues 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: 'libtasn1.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/02
11
12
13Index: libtasn1-2.11/configure.ac
14===================================================================
15--- libtasn1-2.11.orig/configure.ac
16+++ libtasn1-2.11/configure.ac
17@@ -38,6 +38,11 @@ lgl_EARLY
18 AC_PROG_YACC
19 AC_PROG_LN_S
20
21+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
22+m4_pattern_allow([AM_PROG_AR])
23+AM_PROG_AR
24+
25+
26 dnl Checks for programs.
27 AC_PROG_INSTALL
28 AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
diff --git a/meta/recipes-support/gnutls/libtasn1_2.12.bb b/meta/recipes-support/gnutls/libtasn1_2.12.bb
index aae409e..d0b4191 100644
--- a/meta/recipes-support/gnutls/libtasn1_2.12.bb
+++ b/meta/recipes-support/gnutls/libtasn1_2.12.bb
@@ -8,9 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
8 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ 8 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
9 file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351" 9 file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351"
10 10
11PR = "r0" 11PR = "r1"
12 12
13SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz" 13SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \
14 file://libtasn1_fix_for_automake_1.12.patch \
15 "
14 16
15SRC_URI[md5sum] = "4eba39fb962d6cf5a370267eae8ff52b" 17SRC_URI[md5sum] = "4eba39fb962d6cf5a370267eae8ff52b"
16SRC_URI[sha256sum] = "0e257a8a01c80e464f73262e13c226e04a15165c2ad087a340f53902281a1c5d" 18SRC_URI[sha256sum] = "0e257a8a01c80e464f73262e13c226e04a15165c2ad087a340f53902281a1c5d"