Made valgrind build with glibc 2.5 (bug #152297)

Package-Manager: portage-2.1.2_pre1

4 files changed, 271 insertions, 13 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index bff5b759f5ad..6ee94b809db3 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.66 2006/09/17 16:49:18 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.67 2006/10/24 16:07:36 griffon26 Exp $
+
+  24 Oct 2006; Maurice van der Pot <griffon26@gentoo.org>
+  +files/valgrind-3.2.1-glibc-2.5.patch, valgrind-3.2.1.ebuild:
+  Made valgrind build with glibc 2.5 installed. Thanks to Ed Catmur 
+  <ed@catmur.co.uk> for reporting the problem and looking up the 
+  appropriate patches (bug #152297).
 
 *valgrind-3.2.1 (17 Sep 2006)
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index e46d0879cd0b..4c7269223f1a 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -5,6 +5,10 @@ AUX valgrind-3.1.0-amd64-nomultilib-fix.patch 302 RMD160 50340968e8eb5aa261c8b65
 MD5 2622d413602e236208128310f4736453 files/valgrind-3.1.0-amd64-nomultilib-fix.patch 302
 RMD160 50340968e8eb5aa261c8b65c3d69ed9c9405f2e7 files/valgrind-3.1.0-amd64-nomultilib-fix.patch 302
 SHA256 61ad946583bf37742271adcec9731d092cd78917312ebc00248364af7620795b files/valgrind-3.1.0-amd64-nomultilib-fix.patch 302
+AUX valgrind-3.2.1-glibc-2.5.patch 4985 RMD160 24600456338aa280809b9377ea03d055b2b9fd51 SHA1 3ad5e74bdbca2826a8f9e7d91ccc703a56837fe6 SHA256 26d1a8fe0630c3408db782616965cfd2dc14b480c90c51c0ddad4dd85db29836
+MD5 66cac40654067aff726b9e2c401c4dfd files/valgrind-3.2.1-glibc-2.5.patch 4985
+RMD160 24600456338aa280809b9377ea03d055b2b9fd51 files/valgrind-3.2.1-glibc-2.5.patch 4985
+SHA256 26d1a8fe0630c3408db782616965cfd2dc14b480c90c51c0ddad4dd85db29836 files/valgrind-3.2.1-glibc-2.5.patch 4985
 AUX valgrind-3.2.1-only64bit.patch 560 RMD160 d7203e51c4bc6be4003f0715c779e9b384beff06 SHA1 e5f27e95f1608c611b599140f2e175769a47bb80 SHA256 f4100efb266b49503ab198f5540ad05e4a9defe19d579348e5c7edcad0ffae63
 MD5 d36522c62616d6677a1b82fcf103de50 files/valgrind-3.2.1-only64bit.patch 560
 RMD160 d7203e51c4bc6be4003f0715c779e9b384beff06 files/valgrind-3.2.1-only64bit.patch 560
@@ -24,14 +28,18 @@ EBUILD valgrind-3.2.0.ebuild 2472 RMD160 baca21d789e6b5b1432bacb8b5b9732df9a8816
 MD5 4f6b8d70936f487a308b8a35e59e7901 valgrind-3.2.0.ebuild 2472
 RMD160 baca21d789e6b5b1432bacb8b5b9732df9a88165 valgrind-3.2.0.ebuild 2472
 SHA256 c2cdcd9192b0fc468b2fd91c43b6801325433af5e30fc69a0f9df376551f86f5 valgrind-3.2.0.ebuild 2472
-EBUILD valgrind-3.2.1.ebuild 2864 RMD160 14842bc3a512e059b4ba51150ea906a429b277f1 SHA1 e6bb5c1e6abb19ed63bff7fa96111a1cd0b0d88d SHA256 4d78bd8b3d42a67423344b39ce35cf967b8d1fc44d76ffb6a2b404f1813408f5
-MD5 a2939ae770c579a1c530a74dc8e43c8b valgrind-3.2.1.ebuild 2864
-RMD160 14842bc3a512e059b4ba51150ea906a429b277f1 valgrind-3.2.1.ebuild 2864
-SHA256 4d78bd8b3d42a67423344b39ce35cf967b8d1fc44d76ffb6a2b404f1813408f5 valgrind-3.2.1.ebuild 2864
-MISC ChangeLog 9399 RMD160 08027695c54179790ad445c5175d6be900e9fd1f SHA1 d8026e4d8c0693f0e30d98f19f94e8400781e2c7 SHA256 824ac2084ba332f7025b7f9240ac51c41642da65ca38276ace28e927ad8b2e8c
-MD5 695e24e902a3246e642d979087bd2ee4 ChangeLog 9399
-RMD160 08027695c54179790ad445c5175d6be900e9fd1f ChangeLog 9399
-SHA256 824ac2084ba332f7025b7f9240ac51c41642da65ca38276ace28e927ad8b2e8c ChangeLog 9399
+EBUILD valgrind-3.2.1.ebuild 2934 RMD160 21e56871958f3096864267001872b17082eee2a3 SHA1 25552311fe9e0433bea2c66ca93afa05b6830320 SHA256 608deceb413be8c65a6d3fe6746a4450c8ae4a018e7eae898f068a3b3fad9fab
+MD5 e2e8e15e6f310985e5506d00a8972d60 valgrind-3.2.1.ebuild 2934
+RMD160 21e56871958f3096864267001872b17082eee2a3 valgrind-3.2.1.ebuild 2934
+SHA256 608deceb413be8c65a6d3fe6746a4450c8ae4a018e7eae898f068a3b3fad9fab valgrind-3.2.1.ebuild 2934
+MISC .valgrind-3.2.1.ebuild.swp 4096 RMD160 71f440abae16bc836cbafbdb880015408f5e6113 SHA1 872961efa1e5dcfc94410bfcbe42e2ad19ef2771 SHA256 a0d7a979bf2b3ed673b223dfc615ea6cd739dd76284f6175d9ef2008afa0b09f
+MD5 9e7db62af3bfb9d09c5280d6bd792fc7 .valgrind-3.2.1.ebuild.swp 4096
+RMD160 71f440abae16bc836cbafbdb880015408f5e6113 .valgrind-3.2.1.ebuild.swp 4096
+SHA256 a0d7a979bf2b3ed673b223dfc615ea6cd739dd76284f6175d9ef2008afa0b09f .valgrind-3.2.1.ebuild.swp 4096
+MISC ChangeLog 9694 RMD160 06c5aeefabf1da81f58edde0d5f8e5d8cd0bbe97 SHA1 cdafc9f9ade58e6fe3b316f24c8d773b1419f79c SHA256 7b60cb01b0e4979ed1e1d72f494fc58e5e4ae57f92bcc378c4648a9200cea294
+MD5 d6b1911ff6feb9d2935ff36ca54c4979 ChangeLog 9694
+RMD160 06c5aeefabf1da81f58edde0d5f8e5d8cd0bbe97 ChangeLog 9694
+SHA256 7b60cb01b0e4979ed1e1d72f494fc58e5e4ae57f92bcc378c4648a9200cea294 ChangeLog 9694
 MISC metadata.xml 1003 RMD160 e8ef4473e3545a4b98d46101edb49923112ac9e0 SHA1 f76bd7adb86b156832175f968d60c6372fcf8968 SHA256 2bf62ba94d772ac968485392127cf4f4303cccf5a1e6d0733d80507005ca7847
 MD5 799f0b61a3a686b4074bd61acc572c5c metadata.xml 1003
 RMD160 e8ef4473e3545a4b98d46101edb49923112ac9e0 metadata.xml 1003
@@ -48,7 +56,7 @@ SHA256 4ce1d531330a2a0af6e45dc2758c22e9053b93a53f740a97ce6a2f3c9e7ac4f2 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFDXyZMGnpIbeahxwRAmX9AKCCiol3YiNoybq4W3/aPXTXZr87pwCfQbg+
-bVXH0YVHzu90CNekXajf2kE=
-=Wz1K
+iD8DBQFFPjpWMGnpIbeahxwRAoqOAKCiKqujG9PANgmXGaqMMhx6c6NzKQCfWaHw
+IXwnKl/2/laJk6dzhuLUjBM=
+=cbzH
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.2.1-glibc-2.5.patch b/dev-util/valgrind/files/valgrind-3.2.1-glibc-2.5.patch
new file mode 100644
index 000000000000..f0e0387e32c7
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.2.1-glibc-2.5.patch
@@ -0,0 +1,241 @@
+diff -ruN valgrind-3.2.1/configure.in valgrind-3.2.1-fixed/configure.in
+--- valgrind-3.2.1/configure.in	2006-10-24 17:51:14.339715000 +0200
++++ valgrind-3.2.1-fixed/configure.in	2006-10-24 17:52:24.220082250 +0200
+@@ -349,6 +349,16 @@
+ ],
+ glibc="2.4")
+ 
++AC_EGREP_CPP([GLIBC_25], [
++#include <features.h>
++#ifdef __GNU_LIBRARY__
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 5)
++  GLIBC_25
++ #endif
++#endif
++],
++glibc="2.5")
++
+ AC_MSG_CHECKING([the glibc version])
+ 
+ case "${glibc}" in
+@@ -370,9 +380,15 @@
+ 	DEFAULT_SUPP="glibc-2.4.supp ${DEFAULT_SUPP}"
+ 	;;
+ 
++     2.5)
++	AC_MSG_RESULT(2.5 family)
++	AC_DEFINE([GLIBC_2_5], 1, [Define to 1 if you're using glibc 2.5.x])
++	DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}"
++	;;
++
+      *)
+ 	AC_MSG_RESULT(unsupported version)
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2, 2.3 or 2.4])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.5])
+ 	;;
+ esac
+ 
+diff -ruN valgrind-3.2.1/glibc-2.5.supp valgrind-3.2.1-fixed/glibc-2.5.supp
+--- valgrind-3.2.1/glibc-2.5.supp	1970-01-01 01:00:00.000000000 +0100
++++ valgrind-3.2.1-fixed/glibc-2.5.supp	2006-10-24 17:52:31.800556000 +0200
+@@ -0,0 +1,200 @@
++
++##----------------------------------------------------------------------##
++
++# Errors to suppress by default with glibc 2.4.x
++
++# Format of this file is:
++# {
++#     name_of_suppression
++#     tool_name:supp_kind
++#     (optional extra info for some suppression types)
++#     caller0 name, or /name/of/so/file.so
++#     caller1 name, or ditto
++#     (optionally: caller2 name)
++#     (optionally: caller3 name)
++#  }
++#
++# For Memcheck, the supp_kinds are:
++#
++#     Param Value1 Value2 Value4 Value8 Value16
++#     Free Addr1 Addr2 Addr4 Addr8 Addr16
++#     Cond (previously known as Value0)
++#
++# and the optional extra info is:
++#     if Param: name of system call param
++#     if Free: name of free-ing fn)
++
++{
++   dl-hack1
++   Memcheck:Cond
++   fun:_dl_start
++   fun:_start
++}
++
++{
++   dl-hack2
++   Memcheck:Cond
++   obj:/lib*/ld-2.5*.so
++   obj:/lib*/ld-2.5*.so
++   obj:/lib*/ld-2.5*.so
++   obj:/lib*/ld-2.5*.so
++}
++
++{
++   dl-hack3
++   Memcheck:Cond
++   obj:/lib*/ld-2.5*so*
++   obj:/lib*/ld-2.5*so*
++   obj:/lib*/ld-2.5*so*
++}
++
++##----------------------------------------------------------------------##
++{
++   glibc-2.5.x-on-SUSE-10.2-(PPC)-1
++   Memcheck:Cond
++   fun:_dl_start_final
++   fun:_dl_start
++   fun:_start
++}
++{
++   glibc-2.5.x-on-SUSE-10.2-(PPC)-2a
++   Memcheck:Cond
++   fun:index
++   obj:*ld-2.5.*.so
++}
++{
++   glibc-2.5.x-on-SuSE-10.2-(PPC)-2b
++   Memcheck:Addr4
++   fun:index
++   fun:expand_dynamic_string_token
++}
++{
++   glibc-2.5.5-on-SuSE-10.2-(PPC)-2c
++   Memcheck:Addr4
++   fun:index
++   obj:*ld-2.5.*.so
++}
++{
++   glibc-2.3.5-on-SuSE-10.1-(PPC)-3
++   Memcheck:Addr4
++   fun:*wordcopy_fwd_dest_aligned*
++   fun:mem*cpy
++   obj:*lib*2.5.*.so
++}
++
++##----------------------------------------------------------------------##
++## Various structure padding things on SUSE 10.2
++##
++{
++   X11-64bit-padding-1a
++   Memcheck:Param
++   write(buf)
++   fun:__write_nocancel
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++   fun:X*
++}
++{
++   X11-64bit-padding-1b
++   Memcheck:Param
++   write(buf)
++   fun:__write_nocancel
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++   fun:_X*
++}
++{
++   X11-64bit-padding-1c
++   Memcheck:Param
++   write(buf)
++   fun:__write_nocancel
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++}
++{
++   X11-64bit-padding-1d
++   Memcheck:Param
++   write(buf)
++   fun:__write_nocancel
++   obj:/usr/lib*/libICE.so*
++   obj:/usr/lib*/libICE.so*
++   obj:/usr/lib*/libICE.so*
++}
++{
++   X11-64bit-padding-2a
++   Memcheck:Param
++   writev(vector[...])
++   fun:do_writev
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++}
++{
++   X11-64bit-padding-2b
++   Memcheck:Param
++   writev(vector[...])
++   fun:do_writev
++   fun:writev
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++}
++
++{
++   glibc24-64bit-padding-1a
++   Memcheck:Param
++   socketcall.sendto(msg)
++   fun:send
++   fun:get_mapping
++   fun:__nscd_get_map_ref
++   fun:nscd*
++}
++{
++   glibc24-64bit-padding-1b
++   Memcheck:Param
++   socketcall.sendto(msg)
++   fun:__sendto_nocancel
++   obj:/*libc-2.5.so
++   obj:/*libc-2.5.so
++   obj:/*libc-2.5.so
++}
++{
++   glibc24-64bit-padding-1c
++   Memcheck:Param
++   socketcall.send(msg)
++   fun:send
++   fun:__nscd_get_map_ref
++   fun:nscd_get*_r
++   fun:*nscd*
++   obj:/*libc-2.5.so
++}
++
++
++{
++   X11-64bit-padding-3a
++   Memcheck:Param
++   write(buf)
++   obj:/*libpthread-2.4.so*
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++   obj:/usr/lib*/libX11.so*
++}
++
++{
++   X11-64bit-padding-4a
++   Memcheck:Param
++   socketcall.sendto(msg)
++   fun:send
++   obj:/*libc-2.5.so
++   obj:/*libc-2.5.so
++   obj:/*libc-2.5.so
++}
++{
++   X11-64bit-padding-4b
++   Memcheck:Param
++   socketcall.send(msg)
++   fun:send
++   obj:/*libc-2.5.so
++   obj:/*libc-2.5.so
++   obj:/*libc-2.5.so
++}
diff --git a/dev-util/valgrind/valgrind-3.2.1.ebuild b/dev-util/valgrind/valgrind-3.2.1.ebuild
index 99fd81ea1c27..f7a6ec65f8af 100644
--- a/dev-util/valgrind/valgrind-3.2.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.1.ebuild,v 1.1 2006/09/17 16:49:18 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.1.ebuild,v 1.2 2006/10/24 16:07:36 griffon26 Exp $
 
 inherit autotools eutils flag-o-matic toolchain-funcs
 
@@ -36,6 +36,9 @@ src_unpack() {
 	# Fix undefined reference to @VG_PLATFORM@ (bug #147904)
 	epatch "${FILESDIR}/${P}-pkg-config.patch"
 
+	# Don't reject glibc-2.5
+	epatch "${FILESDIR}/${P}-glibc-2.5.patch"
+
 	# Remove defaulting to ppc32-linux on ppc64 without multilib
 	# "valgrind: failed to start tool 'memcheck' for platform 'ppc32-linux': 
 	#  No such file or directory"