From f49e7629dfd278de10a3243a40bddb265de1e98c Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Sun, 27 Jan 2013 15:39:11 -0800 Subject: libtasn1: fix build with automake 1.12 (From OE-Core rev: 6fb4913eb237062303bcda50e9910f53dc95d0dd) Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- .../libtasn1/libtasn1_fix_for_automake_1.12.patch | 28 ++++++++++++++++++++++ meta/recipes-support/gnutls/libtasn1_2.12.bb | 6 +++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch 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 0000000000..5540bef940 --- /dev/null +++ b/meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch @@ -0,0 +1,28 @@ +Upstream-Status: Pending + +This patch avoids following issues 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: 'libtasn1.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 +2012/05/02 + + +Index: libtasn1-2.11/configure.ac +=================================================================== +--- libtasn1-2.11.orig/configure.ac ++++ libtasn1-2.11/configure.ac +@@ -38,6 +38,11 @@ lgl_EARLY + AC_PROG_YACC + AC_PROG_LN_S + ++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it ++m4_pattern_allow([AM_PROG_AR]) ++AM_PROG_AR ++ ++ + dnl Checks for programs. + AC_PROG_INSTALL + 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 aae409ed5a..d0b4191346 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 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351" -PR = "r0" +PR = "r1" -SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ + file://libtasn1_fix_for_automake_1.12.patch \ + " SRC_URI[md5sum] = "4eba39fb962d6cf5a370267eae8ff52b" SRC_URI[sha256sum] = "0e257a8a01c80e464f73262e13c226e04a15165c2ad087a340f53902281a1c5d" -- cgit v1.2.3-54-g00ecf