diff --git a/meta/recipes-support/gnutls/gnutls/conditional.patch b/meta/recipes-support/gnutls/gnutls/conditional.patch deleted file mode 100644 index 2ff532fb53..0000000000 --- a/meta/recipes-support/gnutls/gnutls/conditional.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 292f96f26d7ce80e4a165c903c4fd569b85c1c1f Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Fri, 16 Aug 2024 09:42:15 +0900 -Subject: [PATCH] build: fix setting AM_CONDITIONAL for brotli and zstd - -As the with_{libbrotli,libzsttd} variables are unset if configured -with --without-{brotli,zstd}, check the unequality to "no" doesn't -work; use explicit matching with "yes" instead. - -Signed-off-by: Daiki Ueno - -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 95ec4c1515..a476176800 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1158,7 +1158,7 @@ if test x$ac_brotli != xno; then - else - AC_MSG_RESULT(no) - fi --AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" != "no" && test "$with_libbrotlidec" != "no") -+AM_CONDITIONAL(HAVE_LIBBROTLI, test "$with_libbrotlienc" = yes && test "$with_libbrotlidec" = yes) - - AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [ - save_CFLAGS=$CFLAGS -@@ -1203,7 +1203,7 @@ if test x$ac_zstd != xno; then - else - AC_MSG_RESULT(no) - fi --AM_CONDITIONAL(HAVE_LIBZSTD, test "$with_libzstd" != "no") -+AM_CONDITIONAL(HAVE_LIBZSTD, test "$with_libzstd" = yes) - - AS_IF([test "$ac_cv_dlopen_soname_works" = yes], [ - save_CFLAGS=$CFLAGS --- -GitLab - diff --git a/meta/recipes-support/gnutls/gnutls_3.8.7.1.bb b/meta/recipes-support/gnutls/gnutls_3.8.8.bb similarity index 94% rename from meta/recipes-support/gnutls/gnutls_3.8.7.1.bb rename to meta/recipes-support/gnutls/gnutls_3.8.8.bb index b381520e2e..213b9ff803 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.7.1.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.8.bb @@ -21,15 +21,11 @@ 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 \ file://arm_eabi.patch \ file://0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch \ - file://conditional.patch \ file://run-ptest \ file://Add-ptest-support.patch \ " -SRC_URI[sha256sum] = "9ca0ddaccce28a74fa18d738744190afb3b0daebef74e6ad686bf7bef99abd60" - -# This is only needed for 3.8.7.1, remove when upgrading to 3.8.8 onwards -S = "${WORKDIR}/gnutls-3.8.7" +SRC_URI[sha256sum] = "ac4f020e583880b51380ed226e59033244bc536cad2623f2e26f5afa2939d8fb" inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest