summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-support/gnutls/gnutls.inc9
-rw-r--r--recipes-support/gnutls/gnutls_3.3.27.bb17
-rw-r--r--recipes-support/gnutls/gnutls_3.3.28.bb8
3 files changed, 12 insertions, 22 deletions
diff --git a/recipes-support/gnutls/gnutls.inc b/recipes-support/gnutls/gnutls.inc
index 4a5c3df..4cf375f 100644
--- a/recipes-support/gnutls/gnutls.inc
+++ b/recipes-support/gnutls/gnutls.inc
@@ -8,9 +8,8 @@ LICENSE_${PN}-xx = "LGPLv2.1+"
8LICENSE_${PN}-bin = "GPLv3+" 8LICENSE_${PN}-bin = "GPLv3+"
9LICENSE_${PN}-openssl = "GPLv3+" 9LICENSE_${PN}-openssl = "GPLv3+"
10 10
11LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
12 file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 12 file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
13 file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
14 13
15DEPENDS = "nettle gmp virtual/libiconv" 14DEPENDS = "nettle gmp virtual/libiconv"
16DEPENDS_append_libc-musl = " argp-standalone" 15DEPENDS_append_libc-musl = " argp-standalone"
@@ -21,9 +20,8 @@ SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz"
21 20
22inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc 21inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc
23 22
24PACKAGECONFIG ??= "libidn zlib" 23PACKAGECONFIG ??= "zlib"
25 24
26PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn"
27PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" 25PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1"
28PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" 26PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit"
29PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" 27PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers"
@@ -31,6 +29,7 @@ PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
31 29
32EXTRA_OECONF = " \ 30EXTRA_OECONF = " \
33 --enable-doc \ 31 --enable-doc \
32 --disable-crywrap \
34 --disable-libdane \ 33 --disable-libdane \
35 --disable-guile \ 34 --disable-guile \
36 --disable-rpath \ 35 --disable-rpath \
diff --git a/recipes-support/gnutls/gnutls_3.3.27.bb b/recipes-support/gnutls/gnutls_3.3.27.bb
deleted file mode 100644
index a1dcdb5..0000000
--- a/recipes-support/gnutls/gnutls_3.3.27.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1require gnutls.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
4 file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
5
6SRC_URI += " \
7 file://configure.ac-fix-sed-command.patch \
8 file://use-pkg-config-to-locate-zlib.patch \
9"
10SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3"
11SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f"
12
13# This version doesn't support this option added in newer gnutls
14# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was passed unrecognised options: --with-idn [unknown-configure-option]
15PACKAGECONFIG[libidn] = ""
16# but it still has the libidn dependency, without this option
17EXTRA_OECONF += "--disable-crywrap"
diff --git a/recipes-support/gnutls/gnutls_3.3.28.bb b/recipes-support/gnutls/gnutls_3.3.28.bb
new file mode 100644
index 0000000..1b23369
--- /dev/null
+++ b/recipes-support/gnutls/gnutls_3.3.28.bb
@@ -0,0 +1,8 @@
1require gnutls.inc
2
3SRC_URI += " \
4 file://configure.ac-fix-sed-command.patch \
5 file://use-pkg-config-to-locate-zlib.patch \
6"
7SRC_URI[md5sum] = "e19718d97cee5279edf3f3b9318f926c"
8SRC_URI[sha256sum] = "608f63441abc209c5bd5f61e35f2b6128c22e06fa2ad6248a08d8a643feeb807"