X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 736A3DC21AD for ; Sat, 3 Oct 2015 00:35:00 +0000 (UTC) Received: from lithium.8pit.net (lithium.8pit.net [141.101.32.65]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id B1106DC0630; Sat, 3 Oct 2015 00:34:58 +0000 (UTC) Received: from localhost (ip5f5ac917.dynamic.kabel-deutschland.de [95.90.201.23]); by lithium.8pit.net (OpenSMTPD) with ESMTPSA id 3d0690e5; TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Sat, 3 Oct 2015 02:34:56 +0200 (CEST) From: =?UTF-8?q?S=C3=B6ren=20Tempel?= To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] main/valgrind: upgrade to 3.11.0 Date: Sat, 3 Oct 2015 02:34:50 +0200 Message-Id: <1443832490-22086-1-git-send-email-soeren+git@soeren-tempel.net> X-Mailer: git-send-email 2.6.0 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/valgrind/APKBUILD | 25 ++++++++++++----------- main/valgrind/musl-fixes.patch | 45 +++++++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD index 5c17d74..4e2e8ea 100644 --- a/main/valgrind/APKBUILD +++ b/main/valgrind/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=valgrind -pkgver=3.10.1 -pkgrel=2 +pkgver=3.11.0 +pkgrel=0 pkgdesc="A tool to help find memory-management problems in programs" url="http://valgrind.org/" arch="x86 x86_64" @@ -18,8 +18,7 @@ options="!strip" subpackages="$pkgname-dev $pkgname-doc" source="http://$pkgname.org/downloads/$pkgname-$pkgver.tar.bz2 uclibc.patch - musl-fixes.patch - " + musl-fixes.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -30,7 +29,6 @@ prepare() { esac done aclocal && autoconf && automake --add-missing || return 1 - update_config_sub || return 1 echo '#include ' > include/a.out.h } @@ -44,8 +42,11 @@ build() { --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ - --without-mpicc \ + --sysconfdir=/etc \ --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --without-mpicc \ || return 1 make || return 1 } @@ -68,12 +69,12 @@ package() { paxmark -m "$pkgdir"/usr/lib/valgrind/*-*-linux } -md5sums="60ddae962bc79e7c95cfc4667245707f valgrind-3.10.1.tar.bz2 +md5sums="4ea62074da73ae82e0162d6550d3f129 valgrind-3.11.0.tar.bz2 c29b4572a070eb0d3a6a977be586c771 uclibc.patch -88867c2d838d10023fefe541cf7bd3f0 musl-fixes.patch" -sha256sums="fa253dc26ddb661b6269df58144eff607ea3f76a9bcfe574b0c7726e1dfcb997 valgrind-3.10.1.tar.bz2 +474f8e1f9488b631c4b6d1530fea7f97 musl-fixes.patch" +sha256sums="6c396271a8c1ddd5a6fb9abe714ea1e8a86fce85b30ab26b4266aeb4c2413b42 valgrind-3.11.0.tar.bz2 fab5afea5cb7abec79ff68088d97ccc188613c733b4dfc8ede029cb818ec397f uclibc.patch -9f94b5a8674f5f3c1dead32cff036ae5a513158e14c89cf230cd6f3d47e77feb musl-fixes.patch" -sha512sums="8f3d27637c13b06381b3dd44088244e0cf2f7008f40e46f34322f2a5bfa6373d29ce68ff49f19c48f1a5f139d8be5838b9606206e0ce2599c5f74c0db8ce2642 valgrind-3.10.1.tar.bz2 +1ee00eb48e6984e709de40bb1f147215f8e147edf7b8f6c9ccfbb7cc87114471 musl-fixes.patch" +sha512sums="a25f97fa80aef4ad1e86b303886cd7a97aac248820a4c24e3d3dc26567dd7d2d86db237866468fd43885a9fb8534cb0a8e301a3c752fffbc231a2842272999da valgrind-3.11.0.tar.bz2 d59a10db9037e120df2ee94a103402ca95a79abee9d8be63e4e1bca29c82dca775cc402a79b854ec11a2160a4d2da202c237369418e221d1925267ea2613fd5d uclibc.patch -5a8ce93abd83a66983f0b47acce4e375dd6b8c57d6772d42f51aea0ec0f0c233cef88230d10e54c06446a84c772810d382fd1861019ad9b28578b0e0bd8ff57c musl-fixes.patch" +d77fff2c6c30ce211fd5c0ac232daea10bf3c6843ec3a03f70dcb1739761231ffa549ad19f3a0c82703b38082ad06316575fec91cee6ede750b62781c6b9527c musl-fixes.patch" diff --git a/main/valgrind/musl-fixes.patch b/main/valgrind/musl-fixes.patch index 573c75d..6babdcd 100644 --- a/main/valgrind/musl-fixes.patch +++ b/main/valgrind/musl-fixes.patch @@ -1,39 +1,40 @@ -diff -ru valgrind-3.10.0.orig/configure.ac valgrind-3.10.0/configure.ac ---- valgrind-3.10.0.orig/configure.ac 2014-09-11 12:12:44.000000000 -0300 -+++ valgrind-3.10.0/configure.ac 2014-09-19 13:11:10.338289149 -0300 -@@ -1031,8 +1031,6 @@ - - *) +diff -upr valgrind-3.11.0.orig/configure.ac valgrind-3.11.0/configure.ac +--- valgrind-3.11.0.orig/configure.ac 2015-10-03 02:28:18.597612716 +0200 ++++ valgrind-3.11.0/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 - 2.19]) -- AC_MSG_ERROR([or Darwin or Bionic libc]) +- AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,]) +- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc]) ;; esac -diff -ru valgrind-3.10.0.orig/coregrind/vg_preloaded.c valgrind-3.10.0/coregrind/vg_preloaded.c ---- valgrind-3.10.0.orig/coregrind/vg_preloaded.c 2014-09-19 13:08:26.000000000 -0300 -+++ valgrind-3.10.0/coregrind/vg_preloaded.c 2014-09-19 13:12:31.301626639 -0300 -@@ -57,7 +57,7 @@ +diff -upr valgrind-3.11.0.orig/coregrind/vg_preloaded.c valgrind-3.11.0/coregrind/vg_preloaded.c +--- valgrind-3.11.0.orig/coregrind/vg_preloaded.c 2015-10-03 02:28:18.367636023 +0200 ++++ valgrind-3.11.0/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) - extern void __libc_freeres(void); ---- valgrind-3.10.0.orig/include/pub_tool_redir.h 2014-09-08 15:28:23.000000000 -0300 -+++ valgrind-3.10.0/include/pub_tool_redir.h 2014-09-19 14:12:48.195145620 -0300 -@@ -241,7 +241,7 @@ ++# if !defined(__GLIBC__) \ + && !defined(VGPV_arm_linux_android) \ + && !defined(VGPV_x86_linux_android) \ + && !defined(VGPV_mips32_linux_android) \ +diff -upr valgrind-3.11.0.orig/include/pub_tool_redir.h valgrind-3.11.0/include/pub_tool_redir.h +--- valgrind-3.11.0.orig/include/pub_tool_redir.h 2015-10-03 02:28:18.304309107 +0200 ++++ valgrind-3.11.0/include/pub_tool_redir.h 2015-10-03 02:28:37.745672152 +0200 +@@ -242,7 +242,7 @@ /* --- Soname of the standard C library. --- */ - #if defined(VGO_linux) + #if defined(VGO_linux) || defined(VGO_solaris) -# define VG_Z_LIBC_SONAME libcZdsoZa // libc.so* +# define VG_Z_LIBC_SONAME libcZdZa // libc.* #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6) # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib -@@ -273,7 +273,7 @@ +@@ -274,7 +274,7 @@ /* --- Soname of the pthreads library. --- */ #if defined(VGO_linux) @@ -41,4 +42,4 @@ diff -ru valgrind-3.10.0.orig/coregrind/vg_preloaded.c valgrind-3.10.0/coregrind +# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.* #elif defined(VGO_darwin) # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib - #else + #elif defined(VGO_solaris) -- 2.6.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---