diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-08-31 11:50:03 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-08 00:32:43 +0100 |
commit | 3e53ab2ed16f8c1aa49cb65c7dc74433970d33db (patch) | |
tree | 367f6d7bdd7c8daa2d53562e9726439bdd7cfbaf | |
parent | f7ca989ddc6d470429b547647d3fbaad83a982d9 (diff) | |
download | poky-3e53ab2ed16f8c1aa49cb65c7dc74433970d33db.tar.gz |
gnutls: update to 3.5.3
Add patch to fix compile without libtasn headers.
(From OE-Core rev: b43e4499fb3bae4740660a729a900d951eab00e8)
(From OE-Core rev: 972ab9246e4b5a0f46a4f2b5b1e54773beac11bb)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch | 31 | ||||
-rw-r--r-- | meta/recipes-support/gnutls/gnutls_3.5.3.bb (renamed from meta/recipes-support/gnutls/gnutls_3.5.1.bb) | 5 |
2 files changed, 34 insertions, 2 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch b/meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch new file mode 100644 index 0000000000..d7dd7cf69b --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 2651b08477f42dd7a05ea7d6df410fb2c46de4fb Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Wed, 31 Aug 2016 11:04:06 +0300 | ||
4 | Subject: [PATCH] Use correct include dir with minitasn | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | This allows compiling certtool-cfg without libtasn headers. | ||
10 | |||
11 | Upstream-Status: Submitted [https://gitlab.com/gnutls/gnutls/merge_requests/54] | ||
12 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
13 | --- | ||
14 | src/Makefile.am | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/src/Makefile.am b/src/Makefile.am | ||
18 | index 182f3a5..cf65388 100644 | ||
19 | --- a/src/Makefile.am | ||
20 | +++ b/src/Makefile.am | ||
21 | @@ -146,6 +146,7 @@ libcmd_cli_debug_la_SOURCES = cli-debug-args.def cli-debug-args.c cli-debug-args | ||
22 | COMMON_LIBS = $(LIBOPTS) $(LTLIBINTL) | ||
23 | if ENABLE_MINITASN1 | ||
24 | COMMON_LIBS += ../lib/minitasn1/libminitasn1.la ../gl/libgnu.la | ||
25 | +AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1 | ||
26 | else | ||
27 | COMMON_LIBS += $(LIBTASN1_LIBS) | ||
28 | endif | ||
29 | -- | ||
30 | 2.9.3 | ||
31 | |||
diff --git a/meta/recipes-support/gnutls/gnutls_3.5.1.bb b/meta/recipes-support/gnutls/gnutls_3.5.3.bb index 85d99040fb..1bdca6ab9d 100644 --- a/meta/recipes-support/gnutls/gnutls_3.5.1.bb +++ b/meta/recipes-support/gnutls/gnutls_3.5.3.bb | |||
@@ -3,6 +3,7 @@ require gnutls.inc | |||
3 | SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ | 3 | SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ |
4 | file://0001-configure.ac-fix-sed-command.patch \ | 4 | file://0001-configure.ac-fix-sed-command.patch \ |
5 | file://use-pkg-config-to-locate-zlib.patch \ | 5 | file://use-pkg-config-to-locate-zlib.patch \ |
6 | file://0001-Use-correct-include-dir-with-minitasn.patch \ | ||
6 | " | 7 | " |
7 | SRC_URI[md5sum] = "cb48bb0cf36d329f7321c6cdc0d7ae36" | 8 | SRC_URI[md5sum] = "6c2c7f40ddf52933ee3ca474cb8cb63c" |
8 | SRC_URI[sha256sum] = "bc4a0f80a627c3aca6e7ea59d30e50cda118c61e0e3fab367ff1451d6ec8bdbd" | 9 | SRC_URI[sha256sum] = "92c4bc999a10a1b95299ebefaeea8333f19d8a98d957a35b5eae74881bdb1fef" |