diff --git a/srcpkgs/valgrind/patches/musl-fixes.patch b/srcpkgs/valgrind/patches/musl-fixes.patch deleted file mode 100644 index 440128a4ccd..00000000000 --- a/srcpkgs/valgrind/patches/musl-fixes.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -upr valgrind-3.11.0.orig/configure.ac valgrind-3.11.0/configure.ac ---- configure.ac 2015-10-03 02:28:18.597612716 +0200 -+++ configure.ac 2015-10-03 02:28:49.284502749 +0200 -@@ -1066,8 +1066,6 @@ case "${GLIBC_VERSION}" in - ;; - 2.0|2.1|*) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,]) -- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc]) - ;; - esac - -diff -upr valgrind-3.11.0.orig/coregrind/vg_preloaded.c valgrind-3.11.0/coregrind/vg_preloaded.c ---- coregrind/vg_preloaded.c 2015-10-03 02:28:18.367636023 +0200 -+++ coregrind/vg_preloaded.c 2015-10-03 02:28:37.745672152 +0200 -@@ -56,7 +56,7 @@ - void VG_NOTIFY_ON_LOAD(freeres)( void ); - void VG_NOTIFY_ON_LOAD(freeres)( void ) - { --# if !defined(__UCLIBC__) \ -+# if defined(__GLIBC__) \ - && !defined(VGPV_arm_linux_android) \ - && !defined(VGPV_x86_linux_android) \ - && !defined(VGPV_mips32_linux_android) \ ---- include/pub_tool_redir.h.orig -+++ include/pub_tool_redir.h -@@ -31,6 +31,7 @@ - #ifndef __PUB_TOOL_REDIR_H - #define __PUB_TOOL_REDIR_H - -+#include - #include "config.h" /* DARWIN_VERS */ - - /* The following macros facilitate function replacement and wrapping. -@@ -242,7 +243,11 @@ - /* --- Soname of the standard C library. --- */ - - #if defined(VGO_linux) || defined(VGO_solaris) -+# if defined(__GLIBC__) || defined(__UCLIBC__) - # define VG_Z_LIBC_SONAME libcZdsoZa // libc.so* -+# else -+# define VG_Z_LIBC_SONAME libcZdZa // libc.* -+# endif - - #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6) - # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib -@@ -274,7 +279,11 @@ - /* --- Soname of the pthreads library. --- */ - - #if defined(VGO_linux) -+# if defined(__GLIBC__) || defined(__UCLIBC__) - # define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0 -+# else -+# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.* -+# endif - #elif defined(VGO_darwin) - # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib - #elif defined(VGO_solaris) diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template index 3a8cd04a5e2..dfc2aae2c33 100644 --- a/srcpkgs/valgrind/template +++ b/srcpkgs/valgrind/template @@ -1,6 +1,6 @@ # Template file for 'valgrind' pkgname=valgrind -version=3.12.0 +version=3.13.0 revision=1 only_for_archs="i686 x86_64 armv7l i686-musl x86_64-musl armv7l-musl" build_style=gnu-configure @@ -12,8 +12,8 @@ short_desc="Tool for finding memory management bugs in programs" maintainer="Juan RP " homepage="http://valgrind.org/" license="GPL-2" -distfiles="http://www.valgrind.org/downloads/${pkgname}-${version}.tar.bz2" -checksum=67ca4395b2527247780f36148b084f5743a68ab0c850cb43e4a5b4b012cf76a1 +distfiles="https://sourceware.org/pub/${pkgname}/${pkgname}-${version}.tar.bz2" +checksum=d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b CFLAGS="-fno-stack-protector" CXXFLAGS="-fno-stack-protector"