mirror of
https://git.yoctoproject.org/poky
synced 2026-04-19 15:32:13 +02:00
gnutls: upgrade to 3.8.7.1
A notable change in 3.8.7 is that the linkage to compression libraries was changed to use a new tool called dlwrap, so these libraries should be loaded at runtime with dlopen() instead of dynamically linked at build time. However, the dlopen() detection fails in cross builds[1] and it falls back to dynamic linking so this isn't an issue we need to deal with at present. Also note that whilst dlwrap is a tool written in rust that needs the clang includes, it's a maintainer tool and the generated files are in git, so we should never need to rerun it. Backport a patch to fix AM_CONDITIONAL to resolve linkage problems. The 3.8.7.1 tarball is actually just a rebuild of 3.8.7 with the translations included (which were missing in 3.8.7), so set S explicitly for this release. [1] https://gitlab.com/gnutls/gnutls/-/issues/1583 (From OE-Core rev: d38f32f493192fa5965f7271ef6ba5aae33849f5) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
1d813b0d53
commit
ce3415da91
42
meta/recipes-support/gnutls/gnutls/conditional.patch
Normal file
42
meta/recipes-support/gnutls/gnutls/conditional.patch
Normal file
@@ -0,0 +1,42 @@
|
||||
From 292f96f26d7ce80e4a165c903c4fd569b85c1c1f Mon Sep 17 00:00:00 2001
|
||||
From: Daiki Ueno <ueno@gnu.org>
|
||||
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 <ueno@gnu.org>
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
---
|
||||
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
|
||||
|
||||
@@ -21,11 +21,15 @@ 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] = "2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd"
|
||||
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"
|
||||
|
||||
inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest
|
||||
|
||||
Reference in New Issue
Block a user