From: Daiki Ueno <ueno@gnu.org>
Date: Fri, 28 May 2021 06:50:19 +0000 (+0200)
Subject: gnulib: update git submodule
X-Git-Tag: 3.7.2~4^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7635d4ecddc8a63c5874978eed9f1a954a6ce08;p=thirdparty%2Fgnutls.git

gnulib: update git submodule

Signed-off-by: Daiki Ueno <ueno@gnu.org>
---

diff --git a/configure.ac b/configure.ac
index fc648a7e65..8f60db08c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -457,6 +457,9 @@ fi
 
 AM_CONDITIONAL(HAVE_LIBUNISTRING, test "$ac_have_unistring" = "yes")
 
+# specify our own suppressions file; this needs to be set before gl_INIT
+DEFAULT_VALGRINDFLAGS='-q --error-exitcode=1 --leak-check=full --track-origins=yes --gen-suppressions=all --suppressions=\$(srcdir)/suppressions.valgrind'
+
 dnl Note that g*l_INIT are run after we check for library capabilities,
 dnl to prevent issues from caching lib dependencies. See discussion
 dnl in https://bugs.gentoo.org/show_bug.cgi?id=494940 and
@@ -555,6 +558,8 @@ if test "$gl_gcc_warnings" = yes; then
   gl_WARN_ADD([-fdiagnostics-show-option])
 fi
 
+gl_VALGRIND_TESTS_DEFAULT_NO
+
 if test "$gl_cv_opt_valgrind_tests" != no; then
   gl_WARN_ADD([-fno-builtin-strcmp])
 fi
diff --git a/gl/override/m4/valgrind-tests.m4.diff b/gl/override/m4/valgrind-tests.m4.diff
deleted file mode 100644
index 95351fa361..0000000000
--- a/gl/override/m4/valgrind-tests.m4.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/m4/valgrind-tests.m4 b/m4/valgrind-tests.m4
-index 50d90e145..5e198b455 100644
---- a/m4/valgrind-tests.m4
-+++ b/m4/valgrind-tests.m4
-@@ -12,9 +12,9 @@ dnl From Simon Josefsson
- AC_DEFUN([gl_VALGRIND_TESTS],
- [
-   AC_ARG_ENABLE([valgrind-tests],
--    AS_HELP_STRING([--disable-valgrind-tests],
--                   [don't try to run self tests under valgrind]),
--    [opt_valgrind_tests=$enableval], [opt_valgrind_tests=yes])
-+    AS_HELP_STRING([--enable-valgrind-tests],
-+                   [try to run self tests under valgrind]),
-+    [opt_valgrind_tests=$enableval], [opt_valgrind_tests=no])
- 
-   # Run self-tests under valgrind?
-   if test "$opt_valgrind_tests" = "yes" && test "$cross_compiling" = no; then
-@@ -45,7 +45,7 @@ AC_DEFUN([gl_VALGRIND_TESTS],
-     if test -n "$VALGRIND"; then
-       AC_CACHE_CHECK([for valgrind options for tests],
-         [gl_cv_opt_valgrind_tests],
--        [gl_valgrind_opts='-q --error-exitcode=1 --leak-check=full'
-+        [gl_valgrind_opts='-q --error-exitcode=1 --leak-check=full --track-origins=yes --gen-suppressions=all --suppressions=\$(srcdir)/suppressions.valgrind'
-          if $VALGRIND $gl_valgrind_opts ls > /dev/null 2>&1; then
-            gl_cv_opt_valgrind_tests="$gl_valgrind_opts"
-          else
diff --git a/gnulib b/gnulib
index 257183ec1e..3639c57a97 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 257183ec1ea1517d5ae6dac2e8724a90e23e864a
+Subproject commit 3639c57a970191e0bf7a9789bd1341786d0255a1