Added build fix to valgrind for glibc 2.7 (bug #199001)

Package-Manager: portage-2.1.3.19

4 files changed, 290 insertions, 13 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 66c27920650b..2b1186fec300 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.81 2007/11/06 00:57:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.82 2007/11/17 19:53:06 griffon26 Exp $
+
+  17 Nov 2007; Maurice van der Pot <griffon26@gentoo.org>
+  +files/valgrind-3.2.3-glibc-2.7.patch, valgrind-3.2.3-r1.ebuild:
+  Added glibc-2.7 suppression file and build fix as requested in bug #199001 by
+  <nedrandersoff@yahoo.com>. Thanks to Florian Maier <floma@onlinehome.de> for
+  the patch.
 
   06 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   valgrind-3.2.3-r1.ebuild:
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 455ff5c55d6f..ff9026eacb22 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -17,6 +17,10 @@ AUX valgrind-3.2.3-glibc-2.6.patch 5825 RMD160 52e5c472eeeb418ea77ef1f3f3e4489d4
 MD5 5e15d974cd371bd97ad5b957f54970a2 files/valgrind-3.2.3-glibc-2.6.patch 5825
 RMD160 52e5c472eeeb418ea77ef1f3f3e4489d4d4f5031 files/valgrind-3.2.3-glibc-2.6.patch 5825
 SHA256 23bd0d40098d6a16f09152e77ba61bd97332be499b1a106e9bae9000ab200c29 files/valgrind-3.2.3-glibc-2.6.patch 5825
+AUX valgrind-3.2.3-glibc-2.7.patch 5555 RMD160 24671cce520a45804eac0ce3ecf5c11d8d7bd30e SHA1 338ba61a195ba49e646dc1860a792517298d8b17 SHA256 9d32c2690fa0663ffeeacc7c971c3b9953202d4c279e15d8977740417dfd32d7
+MD5 200a16c3d4a619f6c6ece72d4c423ae7 files/valgrind-3.2.3-glibc-2.7.patch 5555
+RMD160 24671cce520a45804eac0ce3ecf5c11d8d7bd30e files/valgrind-3.2.3-glibc-2.7.patch 5555
+SHA256 9d32c2690fa0663ffeeacc7c971c3b9953202d4c279e15d8977740417dfd32d7 files/valgrind-3.2.3-glibc-2.7.patch 5555
 AUX valgrind-3.2.3-pkg-config.patch 670 RMD160 26d8f37182da50110e4c40c5be0ec9d06185d7fd SHA1 83bda9ceebc7c13586c5bcd49c809c72e2e7511d SHA256 ffd44e653b95326ef1915f406e35cca9a0898ba3e101965d0f6e4229c72c38d5
 MD5 56c668771fc165efb41e30605881b474 files/valgrind-3.2.3-pkg-config.patch 670
 RMD160 26d8f37182da50110e4c40c5be0ec9d06185d7fd files/valgrind-3.2.3-pkg-config.patch 670
@@ -36,18 +40,18 @@ EBUILD valgrind-3.2.1.ebuild 2927 RMD160 5531757b597e68afccafea01ba3a63eea839013
 MD5 9bf9dfe0665fb086deb19375baafe475 valgrind-3.2.1.ebuild 2927
 RMD160 5531757b597e68afccafea01ba3a63eea839013c valgrind-3.2.1.ebuild 2927
 SHA256 be06feb84c605791424db4305da8e702d3b5a2d2255a833e182cee535a4a6d08 valgrind-3.2.1.ebuild 2927
-EBUILD valgrind-3.2.3-r1.ebuild 3050 RMD160 ba3126d4f880c2ed7e1897ecc07906df8eb48155 SHA1 4615c4690859e748fd73f65aa621b04792eb94a5 SHA256 597993d6b722997611de06c83560a7ef19ad3f9eaa76917cc3a232c4f8bcdc62
-MD5 3e70a19f8af7ca21fb87de879f25437d valgrind-3.2.3-r1.ebuild 3050
-RMD160 ba3126d4f880c2ed7e1897ecc07906df8eb48155 valgrind-3.2.3-r1.ebuild 3050
-SHA256 597993d6b722997611de06c83560a7ef19ad3f9eaa76917cc3a232c4f8bcdc62 valgrind-3.2.3-r1.ebuild 3050
+EBUILD valgrind-3.2.3-r1.ebuild 3094 RMD160 464b6b6219e8fd53b0f6e10018bfe47655a3e75c SHA1 bbfa1d936c741bf3a3353a14d6a354342e86aae7 SHA256 8e0326bbdfd05670639c5de0712fc31218c6cd6bdd233dfb429ae80aa502e4e5
+MD5 c1351b1ed6470c427ec2a5c472696355 valgrind-3.2.3-r1.ebuild 3094
+RMD160 464b6b6219e8fd53b0f6e10018bfe47655a3e75c valgrind-3.2.3-r1.ebuild 3094
+SHA256 8e0326bbdfd05670639c5de0712fc31218c6cd6bdd233dfb429ae80aa502e4e5 valgrind-3.2.3-r1.ebuild 3094
 EBUILD valgrind-3.2.3.ebuild 3045 RMD160 f6477fea15734de984994306e19c6222a64ad0b3 SHA1 898f6bce8fde85ed9a77b745ff080b9766b8b93f SHA256 8a6b3c69d44c6b56f8fbe987a78782ef1165c347aa4be2b623de0f088556d11f
 MD5 d6dbe804b83abcaf0e03a0b01a0709af valgrind-3.2.3.ebuild 3045
 RMD160 f6477fea15734de984994306e19c6222a64ad0b3 valgrind-3.2.3.ebuild 3045
 SHA256 8a6b3c69d44c6b56f8fbe987a78782ef1165c347aa4be2b623de0f088556d11f valgrind-3.2.3.ebuild 3045
-MISC ChangeLog 11839 RMD160 d0f86db5da048194fce665b2c81f17a119fe869a SHA1 3e49c4945a1b3ff857e40896abf15956ee02faec SHA256 c65ec6ec423ebd4d295c5cf96ebcd779db63fc959fc74046576601e4fc5416a4
-MD5 b595f268ed2024f4e27db3e5097d7adf ChangeLog 11839
-RMD160 d0f86db5da048194fce665b2c81f17a119fe869a ChangeLog 11839
-SHA256 c65ec6ec423ebd4d295c5cf96ebcd779db63fc959fc74046576601e4fc5416a4 ChangeLog 11839
+MISC ChangeLog 12138 RMD160 40dff413bf8e9cdd48e1071af968540c58931297 SHA1 5111b8de935763fcbbd660073972ab2ea68f1950 SHA256 3e8b78b205f41dea24aeccc3cc1105b62a318f58e6dc91e1cb8cbdbf739b55fa
+MD5 a01799c036509d2b4fc96e9c9cad56d8 ChangeLog 12138
+RMD160 40dff413bf8e9cdd48e1071af968540c58931297 ChangeLog 12138
+SHA256 3e8b78b205f41dea24aeccc3cc1105b62a318f58e6dc91e1cb8cbdbf739b55fa ChangeLog 12138
 MISC metadata.xml 1003 RMD160 e8ef4473e3545a4b98d46101edb49923112ac9e0 SHA1 f76bd7adb86b156832175f968d60c6372fcf8968 SHA256 2bf62ba94d772ac968485392127cf4f4303cccf5a1e6d0733d80507005ca7847
 MD5 799f0b61a3a686b4074bd61acc572c5c metadata.xml 1003
 RMD160 e8ef4473e3545a4b98d46101edb49923112ac9e0 metadata.xml 1003
@@ -67,7 +71,7 @@ SHA256 c8597bd67dd8460be263e80557d2accb57b4a820c93aa802de76f2c8bd649352 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHL7wKkT4lNIS36YERAvnYAKC+h/PnNdWHCx58hw//zV7DPSyFbwCfRoRs
-HHUVjmPkQ4Oeqga+A0OwGBY=
-=OpK3
+iD8DBQFHP0awMGnpIbeahxwRAhe+AJ9Sqr2+oK/DHnQ/vQ+m9hGHsbax7QCfYM87
+55bmeeCEx2EskGnviJB6HqM=
+=5loX
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.2.3-glibc-2.7.patch b/dev-util/valgrind/files/valgrind-3.2.3-glibc-2.7.patch
new file mode 100644
index 000000000000..e6b98fe8d674
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.2.3-glibc-2.7.patch
@@ -0,0 +1,266 @@
+--- configure.in	2007-11-14 21:18:56.000000000 +0100
++++ configure.in.fixed	2007-11-14 21:21:16.000000000 +0100
+@@ -369,6 +369,16 @@
+ ],
+ glibc="2.6")
+ 
++AC_EGREP_CPP([GLIBC_27], [
++#include <features.h>
++#ifdef __GNU_LIBRARY__
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 7)
++  GLIBC_27
++ #endif
++#endif
++],
++glibc="2.7")
++
+ AC_MSG_CHECKING([the glibc version])
+ 
+ case "${glibc}" in
+@@ -402,9 +412,15 @@
+ 	DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}"
+ 	;;
+ 
++     2.7)
++	AC_MSG_RESULT(2.7 family)
++	AC_DEFINE([GLIBC_2_7], 1, [Define to 1 if you're using glibc 2.7.x])
++	DEFAULT_SUPP="glibc-2.7.supp ${DEFAULT_SUPP}"
++	;;
++
+      *)
+ 	AC_MSG_RESULT(unsupported version)
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.6])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.7])
+ 	;;
+ esac
+ 
+--- glibc-2.7.supp	1970-01-01 01:00:00.000000000 +0100
++++ glibc-2.7.supp.fixed	2007-11-14 21:24:55.000000000 +0100
+@@ -0,0 +1,216 @@
++
++##----------------------------------------------------------------------##
++
++# Errors to suppress by default with glibc 2.7.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.7*.so
++   obj:/lib*/ld-2.7*.so
++   obj:/lib*/ld-2.7*.so
++   obj:/lib*/ld-2.7*.so
++}
++
++{
++   dl-hack3
++   Memcheck:Cond
++   obj:/lib*/ld-2.7*.so
++   obj:/lib*/ld-2.7*.so
++   obj:/lib*/ld-2.7*.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.7*.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.7*.so
++}
++{
++   glibc-2.3.5-on-SuSE-10.1-(PPC)-3
++   Memcheck:Addr4
++   fun:*wordcopy_fwd_dest_aligned*
++   fun:mem*cpy
++   obj:*lib*2.7*.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.7*.so
++   obj:/*libc-2.7*.so
++   obj:/*libc-2.7*.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.7*.so
++}
++
++
++{
++   X11-64bit-padding-3a
++   Memcheck:Param
++   write(buf)
++   obj:/*libpthread-2.7*.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.7*.so
++   obj:/*libc-2.7*.so
++   obj:/*libc-2.7*.so
++}
++{
++   X11-64bit-padding-4b
++   Memcheck:Param
++   socketcall.send(msg)
++   fun:send
++   obj:/*libc-2.7*.so
++   obj:/*libc-2.7*.so
++   obj:/*libc-2.7*.so
++}
++
++##----------------------------------------------------------------------##
++# MontaVista Linux 4.0.1 on ppc32
++{
++    MVL-401-linuxthreads-pthread_create
++    Memcheck:Param
++    write(buf)
++    fun:pthread_create
++}
++{
++   MVL-401-linuxthreads-pthread_create
++   Memcheck:Param
++   write(buf)
++   obj:/lib/libpthread-0.10.so
++   fun:pthread_create
++}
+--- Makefile.am	2007-11-14 21:18:56.000000000 +0100
++++ Makefile.am.fixed	2007-11-14 21:26:34.000000000 +0100
+@@ -17,7 +17,7 @@
+ DIST_SUBDIRS  = $(SUBDIRS)
+ 
+ SUPP_FILES = \
+-	glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp glibc-2.6.supp \
++	glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp glibc-2.6.supp glibc-2.7.supp \
+ 	xfree-3.supp xfree-4.supp
+ 
+ dist_val_DATA = $(SUPP_FILES) default.supp
diff --git a/dev-util/valgrind/valgrind-3.2.3-r1.ebuild b/dev-util/valgrind/valgrind-3.2.3-r1.ebuild
index 0216646bafc4..6f6035504105 100644
--- a/dev-util/valgrind/valgrind-3.2.3-r1.ebuild
+++ b/dev-util/valgrind/valgrind-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.3-r1.ebuild,v 1.2 2007/11/06 00:57:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.3-r1.ebuild,v 1.3 2007/11/17 19:53:06 griffon26 Exp $
 
 inherit autotools eutils flag-o-matic toolchain-funcs
 
@@ -44,6 +44,7 @@ src_unpack() {
 	fi
 
 	epatch "${FILESDIR}/${P}-glibc-2.6.patch"
+	epatch "${FILESDIR}/${P}-glibc-2.7.patch"
 
 	# Prevent "unhandled instruction bytes: 0x66 0x66 0x66 0x66" (bug #189396)
 	epatch "${FILESDIR}/${P}-unhandled-instr-amd64.patch"