Fix compability with recent glibc release.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

5 files changed, 192 insertions, 9 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 22c4bb90946e..423ec28b61e2 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/valgrind
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.118 2010/11/10 01:40:41 blueness Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.119 2011/01/27 04:51:32 ssuominen Exp $
+
+  27 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> valgrind-3.6.0.ebuild,
+  +files/valgrind-3.6.0-glibc-2.13.patch,
+  +files/valgrind-3.6.0-strcasecmp.patch:
+  Fix compability with recent glibc release.
 
 *valgrind-3.6.0 (10 Nov 2010)
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index bf52c2bafd90..bf2c87dce907 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -12,8 +12,10 @@ AUX valgrind-3.5.0-local-labels.patch 1410 RMD160 d026881b5d38b0a009825801ce996e
 AUX valgrind-3.5.0-non-exec-stack.patch 5568 RMD160 540b2bac578b8ee4ef2c9af90865f5034a9baac6 SHA1 ef6ab49b1d803ca0713feb99ec53d30af0cc3160 SHA256 9becbb1e78fd0799124820208f069ecc1de9dc7eb5ee15a76b94869ca8250d2d
 AUX valgrind-3.5.0-respect-LDFLAGS.patch 368 RMD160 e4d633cabe33af12bf9a2a434ee3a76a379423a3 SHA1 31086a72e6cea2f0144ba449c60fc98c454ebd93 SHA256 2d1cff754119681e1923e7a3f06b58535c9e44a0046ced2d67dd0d354c3e606a
 AUX valgrind-3.5.0-stat_h.patch 1402 RMD160 48afbf277b0fec07dcc3e8bf790df4f890b4524b SHA1 9ef0a9c40fa2c46fb2237af0d9a405b8e6e41cab SHA256 d3ddedf021d1952627b0111d149223cbc7f57bf0ab06f097b43e494910719378
+AUX valgrind-3.6.0-glibc-2.13.patch 1761 RMD160 744d6a884896d8aaf8f06808a2a75f0b2c60d8a0 SHA1 ab30f38fa5d083dbe767535f49a5248f0c5d8e43 SHA256 64e9cf83a72baebdb6b895b018fda3d3bfb1d188f71bd078163091a741099c8c
 AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
 AUX valgrind-3.6.0-non-exec-stack.patch 5613 RMD160 641cd94fd5254ea902bd66eb0437e9af0e21fdb4 SHA1 eeb788f208303ef8768d4713c2c01bfd3f2edec4 SHA256 9a5a92506a10af32eba7a28401f061d4a84eac26a4dbb94fc6a19471c4bdb257
+AUX valgrind-3.6.0-strcasecmp.patch 3786 RMD160 7887dd9e2dc9e5934a25106c6413458bbe5203e3 SHA1 4eec14e0c7beb671050d4c91986cc878cdb5494f SHA256 e281b93d1f2e0166fbba6ebd061a8fd7a01edd31b56cf23f1f84617385add0f6
 DIST valgrind-3.3.1.tar.bz2 4544805 RMD160 32fb26de2ffd0d62e66a1f29cfa6785b7ffa8c36 SHA1 3a64ee5f6439815fa6c5200dcfd0399f9dc83348 SHA256 95b7b4d815bd479332637c93e69ec24167cd28d4f9d9f9b718e1b091bb88aafa
 DIST valgrind-3.4.0.tar.bz2 5175209 RMD160 3db249843f0845ca0892e557bede7d21d3112e3f SHA1 ae68418a4c283d14ae6454aca4a720ac936422df SHA256 d5ea4ae5b1ef9fca677a38959060a9acb70b38540721c8bf5c73d09a265f9f74
 DIST valgrind-3.4.1.tar.bz2 5183739 RMD160 425127a02b3707d8d8f2e1ff37e9609a2d0dccbd SHA1 935ea4642b6d9b33a6686c5b0ce70f2f0929fe0d SHA256 669ee7aab8a3a905520159b6d7be35d3911e1a4d7a67d90dc1c12c00693184a9
@@ -26,6 +28,6 @@ EBUILD valgrind-3.4.1-r1.ebuild 3976 RMD160 6347e2eb6e3d236078ea052d0669b095b227
 EBUILD valgrind-3.4.1.ebuild 3046 RMD160 655d9e0fbecaf08e720d74f5f684c85871cd0174 SHA1 86a4a553cc16007e0ee309e2a59d753d8acf9f35 SHA256 21d4972c1cf48e3a12bc6a4ad65a72d5576bc45ef4166c8a16186b410ba93a6e
 EBUILD valgrind-3.5.0-r1.ebuild 3730 RMD160 b485ad3121c741099c5fb3711f52194ebdf464a6 SHA1 e1b3e9748fb9a8fcd5a0a95dc0902321fb4bdbb4 SHA256 5e5e34f33a60efbdd79f129bf28ceccd7ad2b2e069b5987ec762f60187da94f6
 EBUILD valgrind-3.5.0.ebuild 3648 RMD160 d3569e0802939fd698787e234db83f17847e2b03 SHA1 af5bbe18d9ca1cb6be77c495de1fb5429c81aa17 SHA256 9092956486a250b85479e3723138848e6192239e79aca06637dfa0811f21487d
-EBUILD valgrind-3.6.0.ebuild 2921 RMD160 e579ed554ae4e1c3467bc8604cd025315d2e58ad SHA1 04ad6ee87efd0b8206c2a3b9e871f8989140ef87 SHA256 3284fd2e68767d09cf45e0162a2911a67954afaf39edb1f6c15302060c49d57c
-MISC ChangeLog 19651 RMD160 0ea228beebc5bfff3707375e26e4860138944c93 SHA1 0f02a99243ef77a72514a60d219c0c732c4d2c42 SHA256 9bb5c0ca1c6c836b8923e9aaa5075b3266afc523e7bc4b82d71a98e6f592b551
+EBUILD valgrind-3.6.0.ebuild 3040 RMD160 ed2e6ba1c77077c4c171c5b0fb651779c97ca8b2 SHA1 8a8560a12cd63456a2070d86a5375612b19a2ab7 SHA256 bf92aa0977ea7d3978dae720e85fa7643b89d4ebd7c39ade3a36c4d20ba47fea
+MISC ChangeLog 19859 RMD160 590d121cef820cbb58ae9d684d4d3269bf872210 SHA1 b6671b4a7984f97abd2a2bd5c8bb12a4edcfd4b4 SHA256 f0c2d9f5fb4157d1e39f1a8566afafef9de34059f24ea61f504a209eb2bab292
 MISC metadata.xml 1002 RMD160 cac070ef7b7c44166aa21cda6063c597f66d0303 SHA1 adb9b3de0413a58f79b522f06f542854c3aaaca0 SHA256 ad67a48bab8386d59f5481471eb6a474e68a08a7f1d8f8c7a41b1134ac464f68
diff --git a/dev-util/valgrind/files/valgrind-3.6.0-glibc-2.13.patch b/dev-util/valgrind/files/valgrind-3.6.0-glibc-2.13.patch
new file mode 100644
index 000000000000..efe75b495a79
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.0-glibc-2.13.patch
@@ -0,0 +1,56 @@
+http://pkgs.fedoraproject.org/gitweb/?p=valgrind.git;a=summary
+
+--- valgrind/configure.in
++++ valgrind/configure.in
+@@ -649,6 +649,16 @@ _ACEOF
+   GLIBC_VERSION="`$CPP conftest.$ac_ext | $SED -n 's/^glibc version is: //p' | $SED 's/ /./g'`"
+ fi
+ 
++AC_EGREP_CPP([GLIBC_213], [
++#include <features.h>
++#ifdef __GNU_LIBRARY__
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 13)
++  GLIBC_213
++ #endif
++#endif
++],
++GLIBC_VERSION="2.13")
++
+ AC_EGREP_CPP([AIX5_LIBC], [
+ #include <standards.h>
+ #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
+@@ -749,6 +759,13 @@ case "${GLIBC_VERSION}" in
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.13)
++	AC_MSG_RESULT(2.13 family)
++	AC_DEFINE([GLIBC_2_13], 1, [Define to 1 if you're using glibc 2.13.x])
++	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++	;;
+      aix5)
+ 	AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
+ 	AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
+@@ -762,7 +779,7 @@ case "${GLIBC_VERSION}" in
+ 
+      *)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.12])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13])
+ 	AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
+ 	AC_MSG_ERROR([or Darwin libc])
+ 	;;
+--- valgrind/config.h.in
++++ valgrind/config.h.in
+@@ -33,6 +33,9 @@
+ /* Define to 1 if you're using glibc 2.12.x */
+ #undef GLIBC_2_12
+ 
++/* Define to 1 if you're using glibc 2.13.x */
++#undef GLIBC_2_13
++
+ /* Define to 1 if you're using glibc 2.2.x */
+ #undef GLIBC_2_2
+ 
diff --git a/dev-util/valgrind/files/valgrind-3.6.0-strcasecmp.patch b/dev-util/valgrind/files/valgrind-3.6.0-strcasecmp.patch
new file mode 100644
index 000000000000..c406dfbaaad4
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.0-strcasecmp.patch
@@ -0,0 +1,116 @@
+http://pkgs.fedoraproject.org/gitweb/?p=valgrind.git;a=summary
+
+--- valgrind/memcheck/mc_replace_strmem.c
++++ valgrind/memcheck/mc_replace_strmem.c
+@@ -431,6 +430,111 @@ STRCMP(VG_Z_LD64_SO_1,            strcmp
+ #endif
+ 
+ 
++#if defined(VGO_linux)
++extern int tolower (int);
++
++#define STRCASECMP(soname, fnname) \
++   int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
++          ( const char* s1, const char* s2 ); \
++   int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
++          ( const char* s1, const char* s2 ) \
++   { \
++      register unsigned char c1; \
++      register unsigned char c2; \
++      while (True) { \
++         c1 = tolower(*(unsigned char *)s1); \
++         c2 = tolower(*(unsigned char *)s2); \
++         if (c1 != c2) break; \
++         if (c1 == 0) break; \
++         s1++; s2++; \
++      } \
++      if (c1 < c2) return -1; \
++      if (c1 > c2) return 1; \
++      return 0; \
++   }
++
++STRCASECMP(VG_Z_LIBC_SONAME,          strcasecmp)
++STRCASECMP(VG_Z_LIBC_SONAME,          __GI_strcasecmp)
++
++
++#define STRNCASECMP(soname, fnname) \
++   int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
++          ( const char* s1, const char* s2, SizeT nmax ); \
++   int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
++          ( const char* s1, const char* s2, SizeT nmax ) \
++   { \
++      register unsigned char c1; \
++      register unsigned char c2; \
++      SizeT n = 0; \
++      while (True) { \
++         if (n >= nmax) return 0; \
++         if (*s1 == 0 && *s2 == 0) return 0; \
++         if (*s1 == 0) return -1; \
++         if (*s2 == 0) return 1; \
++         c1 = tolower(*(unsigned char*)s1); \
++         c2 = tolower(*(unsigned char*)s2); \
++         if (c1 < c2) return -1; \
++         if (c1 > c2) return 1; \
++         s1++; s2++; n++; \
++      } \
++   }
++
++STRNCASECMP(VG_Z_LIBC_SONAME, strncasecmp)
++STRNCASECMP(VG_Z_LIBC_SONAME, __GI_strncasecmp)
++
++extern int tolower_l (int, void *) __attribute__((weak));
++
++#define STRCASECMP_L(soname, fnname) \
++   int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
++          ( const char* s1, const char* s2, void* l ); \
++   int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
++          ( const char* s1, const char* s2, void* l ) \
++   { \
++      register unsigned char c1; \
++      register unsigned char c2; \
++      while (True) { \
++         c1 = tolower_l(*(unsigned char *)s1, l); \
++         c2 = tolower_l(*(unsigned char *)s2, l); \
++         if (c1 != c2) break; \
++         if (c1 == 0) break; \
++         s1++; s2++; \
++      } \
++      if (c1 < c2) return -1; \
++      if (c1 > c2) return 1; \
++      return 0; \
++   }
++
++STRCASECMP_L(VG_Z_LIBC_SONAME,          strcasecmp_l)
++STRCASECMP_L(VG_Z_LIBC_SONAME,          __GI_strcasecmp_l)
++
++
++#define STRNCASECMP_L(soname, fnname) \
++   int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
++          ( const char* s1, const char* s2, SizeT nmax, void* l ); \
++   int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
++          ( const char* s1, const char* s2, SizeT nmax, void* l ) \
++   { \
++      register unsigned char c1; \
++      register unsigned char c2; \
++      SizeT n = 0; \
++      while (True) { \
++         if (n >= nmax) return 0; \
++         if (*s1 == 0 && *s2 == 0) return 0; \
++         if (*s1 == 0) return -1; \
++         if (*s2 == 0) return 1; \
++         c1 = tolower_l(*(unsigned char*)s1, l); \
++         c2 = tolower_l(*(unsigned char*)s2, l); \
++         if (c1 < c2) return -1; \
++         if (c1 > c2) return 1; \
++         s1++; s2++; n++; \
++      } \
++   }
++
++STRNCASECMP_L(VG_Z_LIBC_SONAME, strncasecmp_l)
++STRNCASECMP_L(VG_Z_LIBC_SONAME, __GI_strncasecmp_l)
++#endif
++
++
+ #define MEMCHR(soname, fnname) \
+    void* VG_REPLACE_FUNCTION_ZU(soname,fnname) (const void *s, int c, SizeT n); \
+    void* VG_REPLACE_FUNCTION_ZU(soname,fnname) (const void *s, int c, SizeT n) \
diff --git a/dev-util/valgrind/valgrind-3.6.0.ebuild b/dev-util/valgrind/valgrind-3.6.0.ebuild
index b2be0c0fa61b..89de70591aaf 100644
--- a/dev-util/valgrind/valgrind-3.6.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.0.ebuild,v 1.1 2010/11/10 01:40:41 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.0.ebuild,v 1.2 2011/01/27 04:51:32 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
@@ -31,15 +31,19 @@ src_prepare() {
 		docs/Makefile.am || die
 
 	# Yet more local labels, this time for ppc32 & ppc64
-	epatch "${FILESDIR}/valgrind-3.6.0-local-labels.patch"
+	epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
 
 	# Don't build in empty assembly files for other platforms or we'll get a QA
 	# warning about executable stacks.
-	epatch "${FILESDIR}/valgrind-3.6.0-non-exec-stack.patch"
+	epatch "${FILESDIR}"/${PN}-3.6.0-non-exec-stack.patch
 
 	# Fix up some suppressions that were not general enough for glibc versions
 	# with more than just a major and minor number.
-	epatch "${FILESDIR}/valgrind-3.4.1-glibc-2.10.1.patch"
+	epatch "${FILESDIR}"/${PN}-3.4.1-glibc-2.10.1.patch
+
+	# Fix for recent glibc
+	epatch "${FILESDIR}"/${PN}-3.6.0-glibc-2.13.patch
+	epatch "${FILESDIR}"/${PN}-3.6.0-strcasecmp.patch
 
 	# Regenerate autotools files
 	eautoreconf