From 0948d1de3a33bdd7574b1c76f615997cecc45189 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 2 Oct 2018 22:01:53 +0000
Subject: user/valgrind: add musl suppressions for dynlinker

---
 user/valgrind/APKBUILD           |  7 ++++---
 user/valgrind/suppressions.patch | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 user/valgrind/suppressions.patch

(limited to 'user/valgrind')

diff --git a/user/valgrind/APKBUILD b/user/valgrind/APKBUILD
index fcbd838d2..d79ba75c4 100644
--- a/user/valgrind/APKBUILD
+++ b/user/valgrind/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=valgrind
 pkgver=3.13.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool to help find memory-management problems in programs"
 url="http://valgrind.org/"
 arch="all"
@@ -18,8 +18,8 @@ source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2
 	uclibc.patch
 	arm.patch
 	0001-Ensure-ELFv2-is-supported-on-PPC64.patch
+	suppressions.patch
 	"
-#	musl-fixes.patch
 
 prepare() {
 	default_prepare
@@ -67,4 +67,5 @@ package() {
 sha512sums="34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009  valgrind-3.13.0.tar.bz2
 d59a10db9037e120df2ee94a103402ca95a79abee9d8be63e4e1bca29c82dca775cc402a79b854ec11a2160a4d2da202c237369418e221d1925267ea2613fd5d  uclibc.patch
 9ee297d1b2b86891584443ad0caadc4977e1447979611ccf1cc55dbee61911b0b063bc4ad936d86c451cedae410cb3219b5a088b2ad0aa17df182d564fe36cfe  arm.patch
-71afb12748f69f0976a299c65572818b70cbce5d04f230a49a50f114351d8083c59a9e197cefbcb9145806797ff4d1d54488f50342b680c9a2b76e4a7f7cf305  0001-Ensure-ELFv2-is-supported-on-PPC64.patch"
+71afb12748f69f0976a299c65572818b70cbce5d04f230a49a50f114351d8083c59a9e197cefbcb9145806797ff4d1d54488f50342b680c9a2b76e4a7f7cf305  0001-Ensure-ELFv2-is-supported-on-PPC64.patch
+d011b2769d35ca3206967e6dac9f3fb24a6496e5bbfdc73342382245c89375b09d6948b10ba3cf8aa0050c79c0dd13b75764aec0ec5c6ac479fa930941067747  suppressions.patch"
diff --git a/user/valgrind/suppressions.patch b/user/valgrind/suppressions.patch
new file mode 100644
index 000000000..a91b93fdf
--- /dev/null
+++ b/user/valgrind/suppressions.patch
@@ -0,0 +1,24 @@
+--- valgrind-3.13.0/configure.ac.old	2017-06-15 13:37:01.000000000 +0000
++++ valgrind-3.13.0/configure.ac	2018-10-02 21:46:48.710000000 +0000
+@@ -1034,7 +1034,7 @@
+      musl)
+ 	AC_MSG_RESULT(Musl)
+ 	AC_DEFINE([MUSL_LIBC], 1, [Define to 1 if you're using Musl libc])
+-	# no DEFAULT_SUPP file yet for musl libc.
++	DEFAULT_SUPP="musl.supp ${DEFAULT_SUPP}"
+ 	;;
+      2.0|2.1|*)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+--- /dev/null	2018-07-03 06:46:12.010000000 +0000
++++ valgrind-3.13.0/musl.supp	2018-10-02 21:44:57.240000000 +0000
+@@ -0,0 +1,10 @@
++# musl does not free `dso` structs allocated during linking on exit.
++{
++   musl:dynlinker
++   Memcheck:Leak
++   match-leak-kinds: reachable
++   fun:calloc
++   ...
++   fun:__dls3
++   obj:/lib/ld-musl-*
++}
-- 
cgit v1.2.3-70-g09d2