Patch 3.10.1 to build against glibc-2.21. Bug #554808.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 42 insertions, 17 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index ea207c60fafc..3c389048ea89 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.185 2015/03/25 13:40:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.186 2015/07/29 02:44:45 blueness Exp $
+
+  29 Jul 2015; Anthony G. Basile <blueness@gentoo.org>
+  +files/valgrind-3.10.1-glibc-2.21.patch, valgrind-3.10.1.ebuild:
+  Patch 3.10.1 to build against glibc-2.21.  Bug #554808.
 
   25 Mar 2015; Agostino Sarubbo <ago@gentoo.org> valgrind-3.10.1.ebuild:
   Stable for x86, wrt bug #541952
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index a4febfcf365d..b847c087330c 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX valgrind-3.10.0-non-exec-stack.patch 6019 SHA256 9256d9c9132492bd937cfaffabfc061601d8f5f5b36adb6bdc53722df14117ee SHA512 8db8ae59ce4f4334c4ee8ea556d2ed5b4c2826bb5753239b47e6c5c3ca9cedc687731d145e8650f84c753a39d1d509bc5bf758204f5b4bdf99a20d2bbee21bdd WHIRLPOOL 3ea723057ba9834c6827a168cf781bd31733d4e50af135e3b08d06d7c2a6ac360e19beed1b58537e8d1f60054315e31d2abef1ed5febd297e17082892d7e2157
+AUX valgrind-3.10.1-glibc-2.21.patch 754 SHA256 a26812fc17bad388e3a30e74cec313ffc8c13bb61f8bb2667008af3d5e4d8984 SHA512 e5fa252633629d0688cbc97d60c91b51796c142c4336f0775266cedc14e53530397290dcdb4d6a4170b0579051fa8a33766d7c43980d6785e56880409ae39218 WHIRLPOOL e106fe74225329e05c89b5e69471c88fe65f7044e357c66509ff4731cf5f2f410e79fed0885af015e7c49d4b9b37e4e491fc870f900da18ef9cab146a37c9050
 AUX valgrind-3.10.1-linux-4.patch 972 SHA256 08956afc6390188a6c8bc0cebb81e806d4006e635076878e21043a57e5df4816 SHA512 22fda4cb41ee38e5b871217abf7c697ac6d1f088e9d6f5c035c6c54b0d008f2f23fe900fc036f0990fbad6284d357838e344ec43c156a5d8ec60d7b377abceaf WHIRLPOOL 99528549388b189328de8fe40715cdeac86f22726c62f9ae5aa677ac1a33aeb610230c421738342c4ed8b3b55e43372ecda943d5c2a4e74a26484ff1c1ef8c50
 AUX valgrind-3.10.1-non-exec-stack.patch 6019 SHA256 812560566e56c32db2ad3a97a2e52327d84648698987079ccf3843203c1e6ddc SHA512 015da8132bb72b81bd017b3e3faefb408a8f053676ff605bec411e40d9b7de21b197f660139df7e540756462406442325305d52ae0da04ac44ec66612fb1b0b3 WHIRLPOOL ddaf89092c4915662e6ba048668715f13e8634edc7cf490099870edda3b23799a76e3c677a430bf966295f84010829217aa0c0f887e48762969b805a365ef101
 AUX valgrind-3.6.0-local-labels.patch 1388 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def SHA512 079abe5bd99e2acf0e33a46db3772e264a2051d048c1cd34a4ee350395ea38b815f7909008ed1123324857ed25ab0159da4c5da37701570be012a0664481bbc6 WHIRLPOOL ba737636a547154947073478048f693bb28a9e353b8a1ac195d701bb8be69e182aa5d043b1c6085639c80752c68e5c8b26e3ec54bdcff7ac53ca71bc62768f58
@@ -21,26 +22,26 @@ DIST valgrind-3.10.1.tar.bz2 10967905 SHA256 fa253dc26ddb661b6269df58144eff607ea
 DIST valgrind-3.7.0.tar.bz2 6624216 SHA256 5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6 SHA512 0ccf6607fe6d26f0dc0f3d6e45f84645925d0a90ce4ecf6acfc6b4d374d3e909b2a628b03c0a964a45d2462cca6877f818a5f72b3e4a5bbf3a2d9b8a9a343d5f WHIRLPOOL 44bf8c423d6f3222f5e777333acc21e94dfa680509b2152289129961296d8afc090466b6407248b6e172b3c42da5448206f257bd63f8e44aba01007f92a6fde1
 DIST valgrind-3.8.1.tar.bz2 7962963 SHA256 473be00576bed311a662b277a2bfbe97d9cca4058e68619a0e420c9fc19958db SHA512 ba31f5d43bd2d9533846bed6456a0eae40ac071ff8732201dd75c9e2cd7e9ce3224cb5928b9c8fc859a75ce6867a9b6a1fb2ba8ab62cd3944893d6d4156ab25c WHIRLPOOL 81e63bb649455ed29fcd60fc7f3cebde456a610118b9b24530d3b2e8aa4a7561369e992af86ffb158e1f7fc0db7b91738564402931a947a79bb789bd26a8e065
 DIST valgrind-3.9.0.tar.bz2 10003156 SHA256 e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0 SHA512 4b748f9f9a647df50db75fb56f83ee2f25bad9f1f4e4f05c4ac1d1e919e6cd954975c1f325dbedb509c44be1a8516ac2a5f269090946a0d728166ab183016c7b WHIRLPOOL e73c4dcdff829a34889f5654c5ec314f32d2c33f9e64bde3f811359a252749a6c677db80bf2aa2647f935cd38a0ccc19c0358a7b13198032c5d636f97e9e71de
-EBUILD valgrind-3.10.1.ebuild 3549 SHA256 4d2df825b423772868044be7128a9e12b5c4867599c1ea642662e22d9cdbe484 SHA512 c1fc3cf8a8a6a07f616410027024dbbce4e5b2976791ce518deb8cc052eb5816c6e5dbcd26a12cc72e143850a56e1b0eaea6287da0a06be6caa6d2b88f9dc1a3 WHIRLPOOL f1df7da64a1e75b2cd5fb7b694fa02607d691a15f699a9b1308c8ccb858dd8d9cdb72151b4daeaa39a2d39a540869723a1cfeb92f7df8a4d73b1c42e56d01be7
+EBUILD valgrind-3.10.1.ebuild 3640 SHA256 c5baf3737a79f2629bda1fc57f9e7dc57df14289fb7f6ce17cec59382bba0a3e SHA512 6389064e5c71565344cd54aaa3a720f69160df7a373d4ba4521e7fc1337e92c01dc398158f2246000d4cf4330cd7605d1243a3536b70a96cf3d1066b6755dea3 WHIRLPOOL 31843e42ddc69b6f10cd98136921b6a1b7ace0b6d2e29e4d7379368ff747311d375859151387e128525d5d10df2d812f15d96a369db3ba122b4a2b868b763446
 EBUILD valgrind-3.7.0-r4.ebuild 3577 SHA256 f95fa83714c79d8c05f5c6f43b93ab91eb47c0a50e37faed055eab2cf5fd30ed SHA512 a4e2586606ab100d16cf3bad564aae5012796826a016c18fb85def0d8b72177ad8a4fa11bde322a8f8e9543f16ae874dc237d83c7efbb88db4a5676fb00d1364 WHIRLPOOL 16885e75e7383ee040ec825fa22bd68bf99fe8062d81e5ea008f84e573b0552d3514182c3c570b75cfa19313147de49e7557ba8d78687d875756b1c9c1251777
 EBUILD valgrind-3.8.1.ebuild 3418 SHA256 9244f56a4e98ab7cc6738f98012aa30192535e4a0011e8b75eeadb6515da94e9 SHA512 5edfb5cd3fc18b6afe2476b753762ac806cb1968cac8ceb4d1a3552e046bd078aa9974f38bad61c24104b1997fb69197244d4404982f1cfbd815a284a82cf085 WHIRLPOOL d66919af12d551d1102a43ac1c9d5643304791a876e1f1bdb81bf4784640b0c7dffa2b6867e59aa6873a0736581ccc96bf7a962348cdd9358c23a615338a641b
 EBUILD valgrind-3.9.0.ebuild 3402 SHA256 27e1d9fbdfe4e1c29665f314fc370e55aec9973d8961bf7ac46b11c8ed7b4b36 SHA512 8dec3dcbaf96f48d1ab9720637de33ebaad944e6424e94c1215cb4470beacb7f62c909a6debc1f5c245d359a701a5e7597e5c1eb7b6e9a2dd38ba255a4d58b84 WHIRLPOOL 1414c2e457ceb831e6146c0477e70930ab5621564f79803a2a1236e8f7c19e0d8a358d3ddfc8d05eedd15f462c4fcbd78cb109d94183e57084e15eaec93f62f0
-MISC ChangeLog 30994 SHA256 e0877a3421bc3342b4cb5f8108a7171acb1ae65a2f6914d474594b8a017bff83 SHA512 54a32fd1aad58dec6ff2629435e3784052d35e69ac29ddacde5c19f0e055f3b7dbd737ad3577d997cd271cc76036b172bdef165a73e94eb25949bdeb84410222 WHIRLPOOL b8971ff0ef4a898ea0fb83cc86d4340e3329a97290bc611d761ad8d61997f340226c64d29c579c366af76c4feb63312596c0f727cfec6c5b465f92cfc9c120da
+MISC ChangeLog 31180 SHA256 da9c64ccba59ab236081a2a3d00f790a3e29799219594aec17df572dd85c4277 SHA512 d9bd1206b5272037af312a6037771cdab9afb806836a669f2958f1924a9c844681e86925d28123f9174f02f2ac72b62b5c564108d6cc4c41f19c4277a7135bd3 WHIRLPOOL 2e2a8f121c363ca32dedcfb3a646494d3d9f974eaaaece550b01b50262981d9b1a8d09c69e2b02d3f7ee7a198079f42a65d3a47454903a59be951e7c85368522
 MISC metadata.xml 1013 SHA256 69a104cb454bfa145365c6eb7740c8331851c1b1cf9c507a3a787995e5a47aa6 SHA512 8ed29082b4adbdde40d277f465d7e2faa404b537c5bd7d7812ef9632648750763f66506596d392d090286f5681047a60541c483195e3756d8ec7725f66de3457 WHIRLPOOL 93c2f17dfeb55910707e3789e028dc75b5efe7786dd8c785432c8cf50044d4b3b97975ed57f6cc26e8a6a259b462a0ad2784707e0969f02ff9b3614b78fc0536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVErrYAAoJELp701BxlEWfI0IQAKFH71RS9hB8zZIQW6IKQ6vh
-8b5sQjr0Ok88gbdt6qeJWMVAfs5Bgp6RaavYmKDoBUG5xK/VZI9SPKoMfsWQEaGy
-RofbBUbWHnrELJB9uVq+m9zsKQW02XRB0Ff+4IBezK0GaQ8L+ByY9e8uqvhGFRXX
-AEuK/AKA6DqC/WiZixE6o9vi34dZyRv+uUJj3VQeOU1tvWYoKjqYQhkFPzQUd/U+
-36r/h8KDXRD5ISPZebsQ9ncfqie0/frntmr+/VZnf0sbW05nYX0jZEE/9qErQrMi
-is35279fedWW+XlqAt7DJ4vv4cIvDLJ0T4UBLu1PNdhowbroAHab3VASQrxissOp
-xNgmGoDhnTGvQ7qTMrEra7VCMLkECir7iAR6hvj42vUog6Q1X77f6kcSqzol5yRX
-Ja1Dvwc+aSbTwiEqIMrxhhEyuBofht/lVUw3LCaHMRbunHagQxlghto8lTcWeWeH
-9tnOAm32m/7px3ThW5iOasLi7vdpcmMkQ4Nw1js69YsDepDns6aouytzPaFFq5eY
-BOXuxn4IypeKR+8nUmbj+OgrwVZnDY5Kox5SAPcjI2GmJCsIvbn5qS5qs6oW7vhm
-/aRWz4UADDecZHhGLgDIhmdiCWeWjp7al6YLsjmfqprrsIhmzoMUjOc481rWsjpa
-2cDpRGKtNCk3SAT3SV1k
-=Nu48
+iQIcBAEBCAAGBQJVuD7PAAoJEJOE+m71LUu6pMAQAK7N3fFMeQzZK5eNsmAshai4
+OPUUU6VNItM1tj5zm6F+O2ikU6T30Eaj7tUIaYZdZSM/tmSQoekXhHwl4g0UP9ns
+D6YRsJBTGnArm7zEU5vVXX4XC0Ufx6jDzuoom5KTKSBX2bHChpsdb9jbWd5faCt4
+vsnKM3pTh3VbDNF7A1gr+oRH3WroGh9swEBLOGHeT1mgivSsDHCuZiLsYS8DyXiA
+l0cw24QwqDZooGWwo+m4WYvZ9pS8CDdVg8VbxDIAM3TY1v9MiXLLXYQKL71OlBWs
+ptGH35bZ4I3Rz6Z5XhZbI5pmBnQ+EZZnmq4wfPMCAep4Zk9SeWtcj6n9pCqbIs6J
+Uitlo9ktV76beVbz3C/zZrp1JaaNXM+ZVg7fuLZMwc1tEVigpAU6K4uBavVsN7bL
+Kzkps6fs4oJmpcvp8oC5FOImX09qpMavKaJh5cuQh5C8fiwijfHZiX2CzIYj7zdV
+aLCYdksppvtjUnYV2/ZJrr40PQpU7KS23QmkI0Yk6WD8J/zG2ecnsFLzwPWAI1DH
+gjE74upnW0X5mcfc9pJgQbNdTZjV3Usc49NETLElLKr+V+4U+GJo43KRT54prxj3
+kYUElmOh8wOGiL/f/u1PjYWJpo7Au1JZxQ6ZPYU76kThA3K4eBhaODBO9UoO82HW
+3v/3t7TEZsu9TLtREfIN
+=CtzL
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch
new file mode 100644
index 000000000000..286e431b0dd6
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch
@@ -0,0 +1,17 @@
+diff -Naur valgrind-3.10.1.orig/configure.ac valgrind-3.10.1/configure.ac
+--- valgrind-3.10.1.orig/configure.ac	2014-11-25 14:41:13.000000000 -0500
++++ valgrind-3.10.1/configure.ac	2015-07-28 22:35:22.315604804 -0400
+@@ -1018,6 +1018,13 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.21)
++	AC_MSG_RESULT(2.21 family)
++	AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.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}"
++	;;
+      darwin)
+ 	AC_MSG_RESULT(Darwin)
+ 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/dev-util/valgrind/valgrind-3.10.1.ebuild b/dev-util/valgrind/valgrind-3.10.1.ebuild
index f3e7ded5c8b7..d0ff8c5a7a3a 100644
--- a/dev-util/valgrind/valgrind-3.10.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.10.1.ebuild,v 1.7 2015/03/25 13:40:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.10.1.ebuild,v 1.8 2015/07/29 02:44:45 blueness Exp $
 
 EAPI="4"
 inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
@@ -43,6 +43,9 @@ src_prepare() {
 	# valgrind works fine on linux-4, bug #543648
 	epatch "${FILESDIR}"/${PN}-3.10.1-linux-4.patch
 
+	# glibc 2.21 fix.  Bug #554808.
+	epatch "${FILESDIR}"/${PN}-3.10.1-glibc-2.21.patch
+
 	# Allow users to test their own patches
 	epatch_user