diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-04-30 14:18:49 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-03 11:43:48 +0100 |
commit | 0d9903d8b9d090b70ed71de22b4f7ad34ee3fc4b (patch) | |
tree | 184c2955184e8541cdfaf4f6d099295dad1452c9 /meta/recipes-support/gnutls | |
parent | 014c9bc54120256f5bbff36c9c0d892b34290688 (diff) | |
download | poky-0d9903d8b9d090b70ed71de22b4f7ad34ee3fc4b.tar.gz |
libtasn1: Upgrade 4.0 -> 4.5
* Remove configure.ac-patch as unnecessary
(From OE-Core rev: d30cb87b6515b8ef3b953d9563354b471cfbdb86)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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_4.5.bb (renamed from meta/recipes-support/gnutls/libtasn1_4.0.bb) | 5 |
2 files changed, 2 insertions, 31 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 deleted file mode 100644 index 5540bef940..0000000000 --- a/meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | This 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 | |||
9 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
10 | 2012/05/02 | ||
11 | |||
12 | |||
13 | Index: 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_4.0.bb b/meta/recipes-support/gnutls/libtasn1_4.5.bb index 289833ec80..f874574c53 100644 --- a/meta/recipes-support/gnutls/libtasn1_4.0.bb +++ b/meta/recipes-support/gnutls/libtasn1_4.5.bb | |||
@@ -9,12 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ | |||
9 | file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351" | 9 | file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351" |
10 | 10 | ||
11 | SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ | 11 | SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ |
12 | file://libtasn1_fix_for_automake_1.12.patch \ | ||
13 | file://dont-depend-on-help2man.patch \ | 12 | file://dont-depend-on-help2man.patch \ |
14 | " | 13 | " |
15 | 14 | ||
16 | SRC_URI[md5sum] = "d3d2d9bce3b6668b9827a9df52635be1" | 15 | SRC_URI[md5sum] = "81d272697545e82d39f6bd14854b68f0" |
17 | SRC_URI[sha256sum] = "41d044f7644bdd1c4f8a5c15ac1885ca1fcbf32f5f6dd4760a19278b979857fe" | 16 | SRC_URI[sha256sum] = "89b3b5dce119273431544ecb305081f3530911001bb12e5d76588907edb71bda" |
18 | 17 | ||
19 | inherit autotools texinfo binconfig lib_package | 18 | inherit autotools texinfo binconfig lib_package |
20 | 19 | ||