Fix for building libitm on x86 #421305 by Rafał Mużyło.

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

3 files changed, 24 insertions, 21 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index a8cd204a0df6..a1a6880169de 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.887 2012/07/23 15:09:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.888 2012/07/23 15:22:04 vapier Exp $
+
+  23 Jul 2012; Mike Frysinger <vapier@gentoo.org> gcc-4.7.1.ebuild:
+  Fix for building libitm on x86 #421305 by Rafał Mużyło.
 
   23 Jul 2012; Mike Frysinger <vapier@gentoo.org> gcc-4.6.3.ebuild:
   Fix building with glibc-2.16 #424970 by Chris Smith.
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 2f56565b56b5..73f63806ad8c 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -63,9 +63,9 @@ DIST gcc-3.2.2.tar.bz2 20311217 SHA256 7035a828b75b425093be26b5748c182696cc0fd94
 DIST gcc-3.2.3-manpages.tar.bz2 129510 SHA256 219efe9cff7d18f7fe8d11721d18f4eb48645c866738b13f3d7c13eb910befee
 DIST gcc-3.2.3-tls-update.patch.bz2 396362 SHA256 36d26ca6e00a0a09ab2716abd05c07f18239039ae7e28fdec68c3fab4f5dd4af
 DIST gcc-3.2.3.tar.bz2 20662887 SHA256 9229434cfdfb79d3183149ac09e1093be642d4be377cc491e75c23b856243fda
-DIST gcc-3.3.6-patches-1.7.tar.bz2 50642 SHA256 bdcf002b324497d0ad2344bf914cf00f6f4200b37c6304ed7a44fdd0f9b4c2fc
+DIST gcc-3.3.6-patches-1.7.tar.bz2 50642 SHA256 bdcf002b324497d0ad2344bf914cf00f6f4200b37c6304ed7a44fdd0f9b4c2fc SHA512 f5ed179c4e6f0d4e9c0f4fafaa2565877002bc3fc0379520f486f1b534ac38ccfc62cfdd2bc9e0ea21bae0799b364811228c4184c759efeac088a49730de8a20 WHIRLPOOL 7a3180b0d4600b48152f92aed7d5d33515076d66175875cce3f3d876bfa54c96c2b301bae21e8e1615ea87ffb9314c69e0bf18c20a52648b39e964e8b96b644e
 DIST gcc-3.3.6-uclibc-patches-1.0.tar.bz2 28882 SHA256 c007f38cb0c57291adf0b367f31e14c84dd1d6f48a388896eb63b6cd4328e418
-DIST gcc-3.3.6.tar.bz2 23972413 SHA256 1c1aa533c67e9da5e55ed4f5736258dc753466bd716bdae3fb88fb66e6ff1d7f
+DIST gcc-3.3.6.tar.bz2 23972413 SHA256 1c1aa533c67e9da5e55ed4f5736258dc753466bd716bdae3fb88fb66e6ff1d7f SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed WHIRLPOOL 27372f9d12cdedaad38e75c3efea3430d6873d92f85ec0024e2cc5ad986c710ed940edecc926a4c25ce14d14cddc1aec3eb35ac2c29e8c85309685d525a99cf1
 DIST gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923 SHA256 5b92fac2afe835a127976fdb6602fb5628cf28e67dd19e8289768a3bb8631ec2
 DIST gcc-3.4.6-patches-1.6.tar.bz2 57487 SHA256 2f3fa6d255b2af14fa18332671fba31f38be08d4c59a1e1f70e3e597cdfcbae0
 DIST gcc-3.4.6.tar.bz2 28193401 SHA256 7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39
@@ -158,7 +158,7 @@ DIST gcc-4.7.0-patches-1.1.tar.bz2 34249 SHA256 1d5f4f36da2a3d1638a9d410ec53c6e5
 DIST gcc-4.7.0-piepatches-v0.5.3.tar.bz2 14635 SHA256 8ae1d16dbb782b551a197c07c3cc12eb0ccd5d0e0c8f02c92bd678c3d96b62dd SHA512 69d9900d4edb01ac6278090f97186200625bb14f2fc0900f556cbea6d7c6d4732f56d453d3833fabf310846650657f00a46e75ea89bb441818ea50bfdd4ffc1f WHIRLPOOL 1d9c9c9c08ae4f143d9ee8abbf4ee7936a0acd085a4470bb25e923e2f2329a2860120e9516e66a277415541d441ebb0eea26d31971e1f9428da665ded6811b24
 DIST gcc-4.7.0-uclibc-patches-1.0.tar.bz2 3009 SHA256 a961197c952731cc6dec7b1467ec28ceab532b21b6406d4a87542ad678fd9066 SHA512 788625b58e0ff93f8b8f11ce11cd76f32123583e77a0c5f71bd46d56d30a4c8cd0bc1d8b9a549ebb27a13160982791d750145c68a96d9beaf7557a373068eeca WHIRLPOOL 4dc018a8a444db96e090498afd7e324393745bd8e5cf5428dc0accecf49545f1d9eba906036a103ec5ce37a06e2f9458b3129228e818b82750feb6c327f5bb61
 DIST gcc-4.7.0.tar.bz2 82518546 SHA256 a680083e016f656dab7acd45b9729912e70e71bbffcbf0e3e8aa1cccf19dc9a5 SHA512 24dab09c73e3c457d268e29d58b21a271c6cfabf93f8cd5261eec6e80ed40dd5455826f6f334cff0dee80891a626dc6ab33cd1eccc28716eb05835ea28cd57ce WHIRLPOOL acbe635ff840f8cf8d8f8eb14a3f950e7155cd2689dc2c6312d3769ee1c78ca49bc3410861874a588009a952fbdbd6d9309e912a7f32c694f020ad57b027b641
-DIST gcc-4.7.1-patches-1.0.tar.bz2 33835 SHA256 9c4aa7925772bbb067d5295ad626fc2f342123f1b4b35551b799a1fda3fe629b SHA512 f7a2db3f96f1162a8a9696baee5ed0d97413446806a04e2727a6503c5a48bf8dc030c412a1865f7cae9ef30200703ce8a85e2ba84b455980c7befb7f82737f14 WHIRLPOOL f5a5259d0686a5a9b96d30755567f3019a6e0a5de403189da174e07882b2512457135725dc8d1c2e5cc1ba2c70754ec8a5be4ce2d28c7b460561e348cf6a5205
+DIST gcc-4.7.1-patches-1.1.tar.bz2 34031 SHA256 6cba46f4953697d6a8e1c1b8f1afcedf3e43d8cd671b32263ab2338fef0e6b34 SHA512 0dc2ef79175b1c30690bdae103041cbc08cc0e3f3e6f20efa5b6a7ddf386932723836338a16e66b3c28b9bf7230775ef9c686e703b173190c748627525d96c58 WHIRLPOOL 40d875ca7797ad18a95e8a341a3211699647d18e12977492e66e020ff5d3fb7b93a0cfeaf20f6a531945640e46e73ae95c3e3cccb3b8f62267cae728d45d3731
 DIST gcc-4.7.1-piepatches-v0.5.3.tar.bz2 14601 SHA256 26aee7449cd3cd642065a0860d723dbb8062066ad87a398241f61210c68513d9 SHA512 47e16c41ec6678f9960bd39b8f7f01a0a956ae112584c3aa8b7fa5107eef1b598eba191d5199280131399ff096a1b0d14c9b5799cdfee837451e48a3405b2374 WHIRLPOOL eee8d3b5fdb8c48c8e8dd3d81381406ceb1c44beb18f543b98142f9d4f87a81592f5fa7f19be19edb0cd14d8270ba82f22b3183d92a25698c68386bf45266820
 DIST gcc-4.7.1-uclibc-patches-1.0.tar.bz2 3027 SHA256 3094860e8235f906856bb2b25882ecfd11b5e675a31c6ae288c3563ae64d037b SHA512 d62ce8b72931316932778bc5a23233d182f37ade15d5ab059eec5d6b4e182b4de14561393d00ac1037fbff403f03e7c1693e754515b38f55f389293124f8e5f6 WHIRLPOOL 9acb42edc3f37a6aa6994bceb053dfb307597c2bc522ae4e1ce4b8412e056a20f9406e21064f5807df2bcb7089d2ee18242360190ce153cb22b512c34971392b
 DIST gcc-4.7.1.tar.bz2 82639660 SHA256 16093f6fa01732adf378d97fe338f113c933bdf56da22bf87c76beff13da406f SHA512 a8085284da733fcd0f8e1cd8c18e445c5c0c77b4c231b25f572dd3a0b5cd6aa59a0f1be24c70338b76c4aa29760aef9760e03cfbfe562f3b05405237ae57df89 WHIRLPOOL f1dc25e4a6a30f5c649759eb781f9f71324e729c034acf21687c8fa7c943dd396d9e2175b2035d9c72d0900366d9af9c616dca9c3d2c8ee957c9c407ca4e98e1
@@ -193,24 +193,24 @@ EBUILD gcc-4.6.1-r1.ebuild 1727 SHA256 c357710688a0217e2fe0030e6d2b6426ef14f6bae
 EBUILD gcc-4.6.2.ebuild 1814 SHA256 7b1042a3a6f957b0d3498059788c08c6935854120f5c33507c720cb839892437 SHA512 8bd91ec127d242f7cd805cfbff5b93aeac19c991f5bf20b8d84860547d081d5c39534776865ba520fc58a812a41a8a6973a7dd67f58bc33042f733d5c0b578d4 WHIRLPOOL fad1e34c429af378be7757891d02b8383bd11f639be5a15d44158fa8a23ebbd79ec020ffb444e2a1af299b19c1b2569fe64d61275d628b64abe46f0c09dcd9a8
 EBUILD gcc-4.6.3.ebuild 1785 SHA256 2bbeca2684b50e1ee5a2950d20afb28a6209dc4c8ddf710c51185e7f05d2f1da SHA512 fbd28bb98c2e5f41366314e94c2d9fdc91a04f100d3104766efe49ec6c807ec265bba9c56d6aac364791df819665d9fdd8f9a7359fd5e5b80cca66782a26a82a WHIRLPOOL e238abbb9bbc5285821b58fdecab7473e689c000d5f293806f63d55da2cc1d4b1af16df167d0b5ea1f80631a528beac2e694d4e96fac1dc7135b7efd9667e487
 EBUILD gcc-4.7.0.ebuild 1845 SHA256 e01233cb6d474f52ddac6132f115d807460ea67ebb99e14a87c7da0e2c6de55e SHA512 55a7c1c7a25c3e9dafd300246e94adee0e9bffd9e0da51c225c5de36458ed2d23da06022517069754c258fad8651083d825f097d15fae615b77b812465f5e837 WHIRLPOOL 2c48a86a100c1ac4eace39b1642d29ae907cae73d55e7a27ecaee368158bb314917db2e447179fcc0843f7e6c9102f4e2f084342f29f53594e6b9d0fbce406b2
-EBUILD gcc-4.7.1.ebuild 1848 SHA256 4bd4b00420f2e7a1e2082065f809c8b603998e1b002c6e169a6c83ccf7ad80bb SHA512 f2479ad5682944a14a02eaa72ad8c021077b3abf4a70f6f11458773302b1560fc6216c2675b4bf51a68bd2da0c396922cf177a7d8a216a2d8f68d8affbfe6e53 WHIRLPOOL fc5a46d97c10605ca2720fcbd4a5166d5a74f8f65c794eb7f0a856559faa97f3b5bcc04b5680bdec3374fbd883e1bcebca234ca692b913698e824099fd23489c
-MISC ChangeLog 41427 SHA256 9a7904992bff6ff52b1c74b715c08d52faf7e46bd519ae0d5e3e34acf4bd1650 SHA512 a64e8263bc5312a6f741ab1afc7723d919791b4e50b84f0e89bd4af1902bc15f25905ad6879e90bdaacd05c3ae67095545cdb0b67aa88261d3b4b18997c568b5 WHIRLPOOL 3fe7e55d9501054c8f1dbea47500fb261965ebf7669b996605d9a567e2beab63bda7460b2dc7ea8c08ab05d9e8ea6600298dfe41e06f2718a3e4f5058214382a
+EBUILD gcc-4.7.1.ebuild 1845 SHA256 03c71cba329c3222c06d06bd00c0593e54e6287c0d2a2c4cd77661974cde4b18 SHA512 c1b8194829d4c984ff2153815b9a7ab234a438c5a17d320cc91d6ffa7901a57ee9c6170679eb9ad6c411749b8d86f02475aae30fc077f76e447a8c5ba3778af1 WHIRLPOOL f3d7b5dd1db4ccd817f4148b937d2e63d7d07de2108787718116f3e2c6945f28bbbaf1ce67d96e296174040d3e19e78580971321057e850277f1b0ad389a8fdb
+MISC ChangeLog 41557 SHA256 52b3f4b7ffea714ca2895492acca865a3037e5de7ef48e0ef38939d7277173fa SHA512 edf55da0b3cc0f3275c7d5fc7f8f37f2cb43eb76dbf99e243ce5bb26e90c06ff43b5b22300229d6aaf27ce545b03945bff44e996451eff4b55c0cd6f1c1793b8 WHIRLPOOL 2ea6e455e5c9d4a15b901b08a86d75e527e1c0205ab4520916b0463b32ae1f453095374053fb5d4a20ce5ef389dc530cc414613d06ccf7b3028af8bcd8db6569
 MISC ChangeLog-2006 112483 SHA256 108a7803efc91b08dd27ca4a83468637222a0685760f63bce724cb486fbc4022 SHA512 2887a66d03f4e1a9c60c743d7aa22147bdd95900b9e759c760a63f1a60c90008585b10b4f46ecc26e0149427bbdb8b83a9de4546d75e9ad935dd8e5377bf8870 WHIRLPOOL a2e1df0a7cead4373b5aeda333d952407049e1945f0a4e7774e1249e9f08ee33faafe0e74adec28b641bf037b8d6a350f45760a25c15e769b23eadb84b7ea48e
 MISC metadata.xml 2017 SHA256 b8397e7ce9649b9086d020ee865f1ccd616b338cdae5be3d57494fd15748d132 SHA512 231a34104c4c0fc8f2a2733572236d7638bc9e7241a6d60b90601f24204c2a7ae5d61d351c75179dce05b4e1b7e367b9ef4f8c6d19c58d3695f5e6cb15ab519a WHIRLPOOL 01599d282637b293265f57c05a91447434d8bb33be54d6e89b8739e0f549b2045e4bc9fb6df8c7a6d0e7d6899b818b6f18454906a73edd529fc9ee57f212cce7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJQDWlZAAoJELEHsLL7fEFWfCEQAKddEeEtLjqUU2IJ7SPYH9Ql
-U6RyZHM4/86DGCQ56FsCmD0t9tfGTvUXu97hJhcSvpSLDbVhOcDZEmYh2Y/UnQ3o
-kQ8Vd9fOhMDo0dbqcOnDI14elHTkUePwvoMOWm7itA91e4eVL0kvvyjiE+0rdP+G
-qJry46zpM1skb18l4UJVQIeg0MDz5nG4R7+myifOHlH7Zzf2xeVbEt9wvphLtSeK
-Xe5XTbnQijRcpI6ex/REg98lp9liqQVMslOVl3oH5SHYjuxi0UDmKp3X0tOdReNF
-EWDmPDzJUYMMVO44t8Jbiut1NZQCv1ppCh354b2KRojRvyjDhy2q4OKbGLykKUQC
-dhXP5tFI6zBncPDVu+GyQwmcQ/gYvl+MQtCXR+v8g5+He7C3FdnfgJd1cSKXzZXK
-3Y6/HKFzUCFlXHpdnebWT9sbhefHTizm40o6U/P4QLcCyzgzOwmB4D/CN/WFUXco
-k8Q3s4h+PbfkbjSSqd4YHGSRazT31JE9tyauPQrJEoQUvP/pQdGr4wL21TZDWpct
-ZW20kqzng4DWFrG64zWhYeHhtMJbaLAR9IfrfLUAv7eSij7Bk7gnbDxzjiwAcxMn
-WWViJha/2jorgH8TPpGqYuhQbdsnMxcDl82Sr6y4hnA7xTBvSSUkBdfc+NvDQpr1
-0+GbmJGukXtBCza46YqN
-=Up2m
+iQIcBAEBAgAGBQJQDWxcAAoJELEHsLL7fEFWv7MQAJgTuXq+GqczlU5RNjKSDty5
+1fL/2VagDZ17GEH55FJzics8qifdPMQwaUs22CH2VKia7xGa1bn/DfostMdPqOIB
+4pjkCKjTq8M5mzGrLmFUAGldy4oI4X2ORZRk8kvkzhd6WK4epiYaLVw7+UILVqds
+RevpoVoPjH2tLbuuc6x4lmyY+rx+SK5VOZuQWpVuj1bDQn/WdEolpKDYk4/z/drQ
+nx7dp03yx+vCqLDvUchO4T9dFzijZNTR3mC8gDh7GSerAOHeGaXXCuXESjqjRlQu
+FY937O4UvprR7IEdQvEnc8rcimGvaxF/5OVOt9/0MVbF02BG0v3LezKXNAc4dPJC
+9PMrd629PRuP4dL+WfSl0KIzvuyUZ/qd/v4P8g+gBEE+fxGFfbDYOeYwRxwRxcNc
+YMZMUKaIE9qoSQZzTxnldL4gGLUcUrD1ilmxkm5gMNgBDyzrunGLbVovKLThKSpo
+8P34wpquV5nvJRdcGAQMjurYIhzvs7vQRnfwqwNHldb7b+XtWiE0wIV4Bk0K+omE
+LAQTesoZxR9PZVZjaLdMigzJ83SG4a8uFZQziDGlFEaGNFJ0yYwxTwtuYXwbknew
+15wuCXm0Z0I1MuS4BU7t70HH7qE2mgCJuhlGriTduX8IIQQyRkxXcZhn4yz9F5hS
+2NvpBO4fdgwR00fLu2J7
+=WkRu
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/gcc-4.7.1.ebuild b/sys-devel/gcc/gcc-4.7.1.ebuild
index f6d8032b8361..37e6ccf90e9e 100644
--- a/sys-devel/gcc/gcc-4.7.1.ebuild
+++ b/sys-devel/gcc/gcc-4.7.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.1.ebuild,v 1.1 2012/06/15 00:28:33 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.1.ebuild,v 1.2 2012/07/23 15:22:04 vapier Exp $
 
-PATCH_VER="1.0"
+PATCH_VER="1.1"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff