diff options
| author |   Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-05-02 18:05:19 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-25 11:17:36 +0100 |
| commit | 1bb75581291e72c6a61d2a937bda0696221fb1d3 (patch) | |
| tree | a061fc03d8a4a81ca5c8564b6861fa6235d624c2 /meta/recipes-support/gnutls | |
| parent | dec7696b737e5921fcac0dbb346851e31a81537b (diff) | |
| download | openembedded-core-contrib-1bb75581291e72c6a61d2a937bda0696221fb1d3.tar.gz | |
libtasn1: fix build with automake 1.12
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-support/gnutls')
| -rw-r--r-- | meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-support/gnutls/libtasn1_2.12.bb | 6 |
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 00000000000..5540bef940d --- /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 <nitin.a.kamble@intel.com> +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 aae409ed5a3..d0b4191346f 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" |