From 6546fc459a378bcecdcf47f62fd37e1cfb92b7d0 Mon Sep 17 00:00:00 2001
From: Johannes Brechtmann <johannes.brechtmann@gmail.com>
Date: Tue, 16 Nov 2021 17:22:22 +0000
Subject: [PATCH] valgrind: update to 3.18.1.

---
 srcpkgs/valgrind/patches/str_tester.patch     | 22 ++++++++++++
 .../patches/tc20_verifywrap_musl.patch        | 11 ++++++
 srcpkgs/valgrind/patches/test_statx.patch     | 18 ++++++++++
 srcpkgs/valgrind/patches/throw.patch          | 34 +++++++++++++++++++
 srcpkgs/valgrind/template                     |  8 ++---
 5 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/valgrind/patches/str_tester.patch
 create mode 100644 srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch
 create mode 100644 srcpkgs/valgrind/patches/test_statx.patch
 create mode 100644 srcpkgs/valgrind/patches/throw.patch

diff --git a/srcpkgs/valgrind/patches/str_tester.patch b/srcpkgs/valgrind/patches/str_tester.patch
new file mode 100644
index 000000000000..cbf64a95e02b
--- /dev/null
+++ b/srcpkgs/valgrind/patches/str_tester.patch
@@ -0,0 +1,22 @@
+rawmemchar is not available on musl, guard it with defined(__GLIBC__)
+
+--- a/memcheck/tests/str_tester.c	2021-10-10 14:17:32.000000000 +0000
++++ b/memcheck/tests/str_tester.c	2021-11-16 19:37:26.950006442 +0000
+@@ -504,7 +504,7 @@
+ #endif
+ 
+ // DDD: better done by testing for the function.
+-#if !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
++#if defined(__GLIBC__) && !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
+ static void
+ test_rawmemchr (void)
+ {
+@@ -1451,7 +1451,7 @@
+   test_strchrnul ();
+ # endif
+ 
+-# if !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
++# if defined(__GLIBC__) && !defined(__APPLE__) && !defined(__sun) && !defined(__FreeBSD__)
+   /* rawmemchr.  */
+   test_rawmemchr ();
+ # endif
diff --git a/srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch b/srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch
new file mode 100644
index 000000000000..ad12ba01302b
--- /dev/null
+++ b/srcpkgs/valgrind/patches/tc20_verifywrap_musl.patch
@@ -0,0 +1,11 @@
+--- a/helgrind/tests/tc20_verifywrap.c	2021-11-16 21:01:30.020008847 +0000
++++ b/helgrind/tests/tc20_verifywrap.c	2021-11-16 21:02:22.140008872 +0000
+@@ -20,7 +20,7 @@
+ 
+ #if !defined(__APPLE__) && !defined(__FreeBSD__)
+ 
+-#if defined(__sun__)
++#if defined(__sun__) || !defined(__GLIBC__)
+ /* Fake __GLIBC_PREREQ on Solaris. Pretend glibc >= 2.4. */
+ # define __GLIBC_PREREQ
+ #else
diff --git a/srcpkgs/valgrind/patches/test_statx.patch b/srcpkgs/valgrind/patches/test_statx.patch
new file mode 100644
index 000000000000..7deb78fc9793
--- /dev/null
+++ b/srcpkgs/valgrind/patches/test_statx.patch
@@ -0,0 +1,18 @@
+--- a/memcheck/tests/linux/sys-statx.c	2021-01-21 15:09:33.000000000 +0000
++++ b/memcheck/tests/linux/sys-statx.c	2021-11-16 20:26:33.970007848 +0000
+@@ -7,11 +7,15 @@
+ #include <assert.h>
+ #include <string.h>
+ #include <sys/syscall.h>
++#if defined(__GLIBC__)
+ #if __GLIBC_PREREQ(2,28)
+ /* struct statx provided in sys/stat.h */
+ #else
+ #include <linux/stat.h>
+ #endif
++#else
++#include <linux/stat.h>
++#endif
+ #include <errno.h>
+ 
+ int check_stat2;
diff --git a/srcpkgs/valgrind/patches/throw.patch b/srcpkgs/valgrind/patches/throw.patch
new file mode 100644
index 000000000000..2bd195d86109
--- /dev/null
+++ b/srcpkgs/valgrind/patches/throw.patch
@@ -0,0 +1,34 @@
+--- a/memcheck/tests/arm64-linux/scalar.h	2021-01-21 15:09:33.000000000 +0000
++++ b/memcheck/tests/arm64-linux/scalar.h	2021-11-16 20:56:18.980008699 +0000
+@@ -14,7 +14,13 @@
+ 
+ // Since we use vki_unistd.h, we can't include <unistd.h>.  So we have to
+ // declare this ourselves.
+-extern long int syscall (long int __sysno, ...) __THROW;
++#ifdef __THROW
++#define THROW __THROW
++#else
++#define THROW
++#endif
++extern long int syscall (long int __sysno, ...) THROW;
++#undef THROW
+ 
+ // Thorough syscall scalar arg checking.  Also serves as thorough checking
+ // for (very) basic syscall use.  Generally not trying to do anything
+--- a/memcheck/tests/x86-linux/scalar.h	2021-01-21 15:09:33.000000000 +0000
++++ b/memcheck/tests/x86-linux/scalar.h	2021-11-16 20:55:24.890008673 +0000
+@@ -14,7 +14,13 @@
+ 
+ // Since we use vki_unistd.h, we can't include <unistd.h>.  So we have to
+ // declare this ourselves.
+-extern long int syscall (long int __sysno, ...) __THROW;
++#ifdef __THROW
++#define THROW __THROW
++#else
++#define THROW
++#endif
++extern long int syscall (long int __sysno, ...) THROW;
++#undef THROW
+ 
+ // Thorough syscall scalar arg checking.  Also serves as thorough checking
+ // for (very) basic syscall use.  Generally not trying to do anything
diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template
index 71f90795aa96..0f4a2c4ba1f8 100644
--- a/srcpkgs/valgrind/template
+++ b/srcpkgs/valgrind/template
@@ -1,6 +1,6 @@
 # Template file for 'valgrind'
 pkgname=valgrind
-version=3.16.1
+version=3.18.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-tls --without-mpicc --enable-lto=yes"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://valgrind.org/"
 distfiles="https://sourceware.org/pub/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca
+checksum=00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5
 
 CFLAGS="-fno-stack-protector"
 CXXFLAGS="-fno-stack-protector"
@@ -41,10 +41,6 @@ if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
 	configure_args+=" ac_cv_host=armv7l-unknown-linux-gnueabihf"
 fi
 
-pre_configure() {
-	autoreconf -fi
-}
-
 valgrind-devel_package() {
 	depends="valgrind>=${version}_${revision}"
 	short_desc+=" - development files"