diff options
Diffstat (limited to 'poky/meta/recipes-support/gnutls')
| -rw-r--r-- | poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch | 29 | ||||
| -rw-r--r-- | poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb | 9 | ||||
| -rw-r--r-- | poky/meta/recipes-support/gnutls/gnutls_3.6.3.bb (renamed from poky/meta/recipes-support/gnutls/gnutls.inc) | 13 |
3 files changed, 9 insertions, 42 deletions
diff --git a/poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch b/poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch deleted file mode 100644 index b6e7bc965..000000000 --- a/poky/meta/recipes-support/gnutls/gnutls/0001-configure.ac-fix-sed-command.patch +++ /dev/null @@ -1,29 +0,0 @@ -From eaab55bb6d48643163eebbc9ca575a9ca2a8e03f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 21 Feb 2017 17:10:07 +0200 -Subject: [PATCH] configure.ac: fix sed command - -The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors -when the S contains "bitbake", fix to "sed 's/\.bak$//'`" - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: gnutls-3.5.16/configure.ac -=================================================================== ---- gnutls-3.5.16.orig/configure.ac -+++ gnutls-3.5.16/configure.ac -@@ -955,7 +955,7 @@ YEAR=`date +%Y` - AC_SUBST([YEAR], $YEAR) - - for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do -- nam=$(basename $i|sed 's/.bak//g') -+ nam=$(basename $i|sed 's/\.bak$//') - if test "$create_libopts_links" = "yes";then - rm -f "src/$nam.stamp" - rm -f "src/$nam" diff --git a/poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb b/poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb deleted file mode 100644 index 7624a203d..000000000 --- a/poky/meta/recipes-support/gnutls/gnutls_3.6.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require gnutls.inc - -SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \ - file://arm_eabi.patch \ - " -SRC_URI[md5sum] = "4b65ae3ffef59f3eeed51a6166ff12b3" -SRC_URI[sha256sum] = "20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed" - -BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-support/gnutls/gnutls.inc b/poky/meta/recipes-support/gnutls/gnutls_3.6.3.bb index 98ec8d966..441bbecf1 100644 --- a/poky/meta/recipes-support/gnutls/gnutls.inc +++ b/poky/meta/recipes-support/gnutls/gnutls_3.6.3.bb @@ -17,7 +17,12 @@ DEPENDS_append_libc-musl = " argp-standalone" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz" +SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ + file://arm_eabi.patch \ +" + +SRC_URI[md5sum] = "d3b1b05c2546b80832101a423a80faf8" +SRC_URI[sha256sum] = "ed642b66a4ecf4851ab2d809cd1475c297b6201d8e8bd14b4d1c08b53ffca993" inherit autotools texinfo binconfig pkgconfig gettext lib_package gtk-doc @@ -25,10 +30,8 @@ PACKAGECONFIG ??= "libidn" # You must also have CONFIG_SECCOMP enabled in the kernel for # seccomp to work. -# PACKAGECONFIG[seccomp] = "ac_cv_libseccomp=yes,ac_cv_libseccomp=no,libseccomp" - -PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn" +PACKAGECONFIG[libidn] = "--with-idn,--without-idn,libidn2" 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" @@ -57,3 +60,5 @@ PACKAGES =+ "${PN}-openssl ${PN}-xx" FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" + +BBCLASSEXTEND = "native nativesdk" |