summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch2
-rw-r--r--meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch10
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.8.9.bb (renamed from meta/recipes-support/gnutls/gnutls_3.8.8.bb)8
3 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch
index 59824d35f1..2dccea7859 100644
--- a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch
+++ b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch
@@ -14,7 +14,7 @@ diff --git a/lib/Makefile.am b/lib/Makefile.am
14index a50d311..193ea19 100644 14index a50d311..193ea19 100644
15--- a/lib/Makefile.am 15--- a/lib/Makefile.am
16+++ b/lib/Makefile.am 16+++ b/lib/Makefile.am
17@@ -198,8 +198,7 @@ hmac_file = .libs/.$(gnutls_so).hmac 17@@ -272,8 +272,7 @@ hmac_file = .libs/.$(gnutls_so).hmac
18 18
19 all-local: $(hmac_file) 19 all-local: $(hmac_file)
20 20
diff --git a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch
index 8e4df7b37e..339d3d2f9e 100644
--- a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch
+++ b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch
@@ -15,9 +15,9 @@ diff --git a/Makefile.am b/Makefile.am
15index 843193f..816b09f 100644 15index 843193f..816b09f 100644
16--- a/Makefile.am 16--- a/Makefile.am
17+++ b/Makefile.am 17+++ b/Makefile.am
18@@ -191,6 +191,9 @@ dist-hook: 18@@ -194,6 +194,9 @@ dist-hook:
19 mv ChangeLog $(distdir) 19 distcheck-hook:
20 touch -c $(distdir)/doc/*.html $(distdir)/doc/*.pdf $(distdir)/doc/*.info 20 @test -d "$(top_srcdir)/po/.reference" || { echo "PO files are not downloaded; run ./bootstrap without --skip-po"; exit 1; }
21 21
22+install-ptest: 22+install-ptest:
23+ $(MAKE) -C tests DESTDIR=$(DESTDIR)/tests $@ 23+ $(MAKE) -C tests DESTDIR=$(DESTDIR)/tests $@
@@ -29,7 +29,7 @@ diff --git a/configure.ac b/configure.ac
29index 1744813..efb9e34 100644 29index 1744813..efb9e34 100644
30--- a/configure.ac 30--- a/configure.ac
31+++ b/configure.ac 31+++ b/configure.ac
32@@ -1226,6 +1226,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS) 32@@ -1491,6 +1491,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS)
33 33
34 AM_CONDITIONAL(NEEDS_LIBRT, test "$gnutls_needs_librt" = "yes") 34 AM_CONDITIONAL(NEEDS_LIBRT, test "$gnutls_needs_librt" = "yes")
35 35
@@ -42,7 +42,7 @@ diff --git a/tests/Makefile.am b/tests/Makefile.am
42index 189d068..8430b05 100644 42index 189d068..8430b05 100644
43--- a/tests/Makefile.am 43--- a/tests/Makefile.am
44+++ b/tests/Makefile.am 44+++ b/tests/Makefile.am
45@@ -668,6 +668,12 @@ SH_LOG_COMPILER = $(SHELL) 45@@ -678,6 +678,12 @@ SH_LOG_COMPILER = $(SHELL)
46 AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind 46 AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind
47 LOG_COMPILER = $(LOG_VALGRIND) 47 LOG_COMPILER = $(LOG_VALGRIND)
48 48
diff --git a/meta/recipes-support/gnutls/gnutls_3.8.8.bb b/meta/recipes-support/gnutls/gnutls_3.8.9.bb
index 26824554ab..f2b7ac7bb8 100644
--- a/meta/recipes-support/gnutls/gnutls_3.8.8.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.8.9.bb
@@ -10,9 +10,9 @@ LICENSE:${PN}-xx = "LGPL-2.1-or-later"
10LICENSE:${PN}-bin = "GPL-3.0-or-later" 10LICENSE:${PN}-bin = "GPL-3.0-or-later"
11LICENSE:${PN}-openssl = "GPL-3.0-or-later" 11LICENSE:${PN}-openssl = "GPL-3.0-or-later"
12 12
13LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ 13LIC_FILES_CHKSUM = "file://README.md;beginline=181;endline=205;md5=e159ff2a6e9cc95141fb0eaff733bba3 \
14 file://doc/COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ 14 file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
15 file://doc/COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" 15 file://COPYING.LESSERv2;md5=4bf661c1e3793e55c8d1051bc5e0ae21"
16 16
17DEPENDS = "nettle gmp virtual/libiconv libunistring" 17DEPENDS = "nettle gmp virtual/libiconv libunistring"
18 18
@@ -25,7 +25,7 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar
25 file://Add-ptest-support.patch \ 25 file://Add-ptest-support.patch \
26 " 26 "
27 27
28SRC_URI[sha256sum] = "ac4f020e583880b51380ed226e59033244bc536cad2623f2e26f5afa2939d8fb" 28SRC_URI[sha256sum] = "69e113d802d1670c4d5ac1b99040b1f2d5c7c05daec5003813c049b5184820ed"
29 29
30inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest 30inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest
31 31