diff options
| -rw-r--r-- | recipes-support/gnutls/gnutls.inc | 9 | ||||
| -rw-r--r-- | recipes-support/gnutls/gnutls_3.3.27.bb | 17 | ||||
| -rw-r--r-- | recipes-support/gnutls/gnutls_3.3.28.bb | 8 |
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+" LICENSE_${PN}-bin = "GPLv3+" LICENSE_${PN}-openssl = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ - file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" DEPENDS = "nettle gmp virtual/libiconv" DEPENDS_append_libc-musl = " argp-standalone" @@ -21,9 +20,8 @@ SRC_URI = "ftp://ftp.gnutls.org/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc -PACKAGECONFIG ??= "libidn zlib" +PACKAGECONFIG ??= "zlib" -PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn" PACKAGECONFIG[libtasn1] = "--with-included-libtasn1=no,--with-included-libtasn1,libtasn1" PACKAGECONFIG[p11-kit] = "--with-p11-kit,--without-p11-kit,p11-kit" PACKAGECONFIG[tpm] = "--with-tpm,--without-tpm,trousers" @@ -31,6 +29,7 @@ PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" EXTRA_OECONF = " \ --enable-doc \ + --disable-crywrap \ --disable-libdane \ --disable-guile \ --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 @@ -require gnutls.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI += " \ - file://configure.ac-fix-sed-command.patch \ - file://use-pkg-config-to-locate-zlib.patch \ -" -SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3" -SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f" - -# This version doesn't support this option added in newer gnutls -# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was passed unrecognised options: --with-idn [unknown-configure-option] -PACKAGECONFIG[libidn] = "" -# but it still has the libidn dependency, without this option -EXTRA_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 @@ +require gnutls.inc + +SRC_URI += " \ + file://configure.ac-fix-sed-command.patch \ + file://use-pkg-config-to-locate-zlib.patch \ +" +SRC_URI[md5sum] = "e19718d97cee5279edf3f3b9318f926c" +SRC_URI[sha256sum] = "608f63441abc209c5bd5f61e35f2b6128c22e06fa2ad6248a08d8a643feeb807" |