summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/gnutls/gnutls/0001-Use-correct-include-dir-with-minitasn.patch31
-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 @@
1From 2651b08477f42dd7a05ea7d6df410fb2c46de4fb Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 31 Aug 2016 11:04:06 +0300
4Subject: [PATCH] Use correct include dir with minitasn
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9This allows compiling certtool-cfg without libtasn headers.
10
11Upstream-Status: Submitted [https://gitlab.com/gnutls/gnutls/merge_requests/54]
12Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
13---
14 src/Makefile.am | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/src/Makefile.am b/src/Makefile.am
18index 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--
302.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
3SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ 3SRC_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 "
7SRC_URI[md5sum] = "cb48bb0cf36d329f7321c6cdc0d7ae36" 8SRC_URI[md5sum] = "6c2c7f40ddf52933ee3ca474cb8cb63c"
8SRC_URI[sha256sum] = "bc4a0f80a627c3aca6e7ea59d30e50cda118c61e0e3fab367ff1451d6ec8bdbd" 9SRC_URI[sha256sum] = "92c4bc999a10a1b95299ebefaeea8333f19d8a98d957a35b5eae74881bdb1fef"