Add fix for building with gcc-4.6 #419627 by Maciej Szmigiero.

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

4 files changed, 60 insertions, 6 deletions

diff --git a/dev-util/mingw-runtime/ChangeLog b/dev-util/mingw-runtime/ChangeLog
index 7dd7113d6bf4..a329ebb1057d 100644
--- a/dev-util/mingw-runtime/ChangeLog
+++ b/dev-util/mingw-runtime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/mingw-runtime
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/ChangeLog,v 1.24 2012/08/12 04:49:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/ChangeLog,v 1.25 2012/08/12 04:50:17 vapier Exp $
+
+  12 Aug 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/mingw-runtime-3.18-gcc-4.6.patch, mingw-runtime-3.18.ebuild:
+  Add fix for building with gcc-4.6 #419627 by Maciej Szmigiero.
 
   12 Aug 2012; Mike Frysinger <vapier@gentoo.org> mingw-runtime-3.20.ebuild,
   +files/mingw-runtime-3.20-LDBL_MIN_EXP.patch:
diff --git a/dev-util/mingw-runtime/Manifest b/dev-util/mingw-runtime/Manifest
index 5f70a7bc02fd..6f153a8304a9 100644
--- a/dev-util/mingw-runtime/Manifest
+++ b/dev-util/mingw-runtime/Manifest
@@ -1,9 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mingw-runtime-3.12-DESTDIR.patch 577 SHA256 aad3d91b2b9340e11527d068160b87f47d94f9fc1076b976086224a194cafe67 SHA512 2652a21dc95a9a4476ec74ef0d94490f50103a0a0d3bfee1fa0ac345ab3fa9047a37d1feea90bf397be3661e63abb3fce42defd6dfe32cc2c50ba365c6fdbb40 WHIRLPOOL 44709c9ae7c833f91d1b42ba5327e03f18301e30d2ad369175230bb75dcc27391c459ea114a81843e07198713ac9cf2714d3e8a147c6c42327331168283a3492
+AUX mingw-runtime-3.18-gcc-4.6.patch 860 SHA256 48fb7a15ac22701524f20eeb44efd0bd0272399d8935371b4f3ea89cbc554c55 SHA512 fea176c3145822487f50b2cccc2ca6ad415a0b7eee49426f6cd22b40c71ecba375e053f6bd15cc8759c645ac9f8634df70062238597b2083fd1d50d2bb563e81 WHIRLPOOL e3cae7c46ba55990b441e7aac854766c4ac319bbdeb08b6989e30d5d8751c6efd0014ae930f4d115e16a5185245b00bbed0307ad34c56d1bcae88ab1ec73ae5c
+AUX mingw-runtime-3.20-LDBL_MIN_EXP.patch 5805 SHA256 2e3d73e60150abd88254b5260105867fcb809497f00c475b4a1b8987144a6a73 SHA512 4e0a644958ff1bf93f7adf3aa5a97e17a42280098d1c5296eefe68484c571e86c57b01daf49aa0301d6043dd140edea54d040d2f69ddfee680df788a95ae7eff WHIRLPOOL 4115e35ed15711613f26c1f5ac052881d2984d3db1ef02d843a10b47a0d38087b68321b7146888d2ed4e7d2ac97653dc408001d82967d83c8c9fe18b2d30da15
 DIST mingwrt-3.16-mingw32-src.tar.gz 381251 SHA256 68cc000f3efd7c5437d29c86e09e2cb4e89aafdff4ac6194fb3c7d92f6e09266 SHA512 f2c92fb229b261119afb94272f3c26cb15d1546c9f82f784eb97f851055131d4e0d6954645994b6777b727517a6c012eda1ddefe637e639a212134c24f76e224 WHIRLPOOL 116eb47d3cdf2b859f53b57a0c90e0814a9a61532967a5e62c190ffbfa46e86fc4e9617100955e59211866546eb21129fca7f044fbe07bd2b79d274caa6274a2
 DIST mingwrt-3.18-mingw32-src.tar.gz 391939 SHA256 de4979fd6eedeb21d2d506fe4880a838706dc88cbebe031e38561967fb7cbd42 SHA512 87778f08469a806dda606b0945d00511fccd0f7e0d545a33e2b4685db2490ec6a3e5e4267090b79a88eb963f97035fe8149097892f1f4a6e85f3a4661eb5e977 WHIRLPOOL c8883fcb3a4d04e9bf28e8ee15c9d5eb1fea62d7d3aed1dcfd4ae90f7186468296dc67dcd27f2e11b4af762e0fd833749a0065f4744992295c45a881aa58817a
 DIST mingwrt-3.20-mingw32-src.tar.gz 393946 SHA256 f1869483318ed1df5e15e49b8315173e90c1caa2968c4956b7657854c36bfe0a SHA512 2d2d3c7decc7b35ab4759034dcd291c8e322a46205ae70fd4c4d68224c9d7c75454b908f61ba8ca7e0fdf18ff121c5b7ffd02e0658b7557e3af1f89ed28ed58c WHIRLPOOL c66a805cdd4500f142e0d38cd3add06046608addba67e1c0167d96dc4838eacd938c6d38c5d423ab7dd6344070445df5105eeac9bbe3529ca528d02c3f31bad3
 EBUILD mingw-runtime-3.16.ebuild 2163 SHA256 52d0172e074ec0c236bbdf2e49bd6ad7d4eadf4b2dab3ae6e71f182245bf2200 SHA512 b4888945150e17e461e4371d92d29251a63325ead9aa011c1256ff120f1176a3d213ef720dc420b2eed728d7709b5ee8cdf3dccc575fb623524337dfb60beb0b WHIRLPOOL be023ad4fcd53024fd02d428ea831e3c01da569644e286a6374f4516e1320ac7749e098ca2dc1a69b450c3500d5decf23ec1b37d12a6abe42a016792acf0e39f
-EBUILD mingw-runtime-3.18.ebuild 1859 SHA256 067c838b2b5ded7019b5f5b8f9fbba49edeab31898af714624d4214300850600 SHA512 8c6c7134cae5b76b8a249235f3bfc105373fbf5650c1cce9ed6c2fc5adcfc5de08e1b015bb0cdd7e48917d8c9542b7e2ba503c770ba264c169c5702d893a4dc4 WHIRLPOOL d172e7960b5aea4966a82bf53208d31cc54fb9cb9fa73e5c021a710a4ba1c47252e0dd4416abfa598391768335a58785403c7fb978156c660afc3da8d990a6a6
-EBUILD mingw-runtime-3.20.ebuild 1966 SHA256 8369dd50c3b52f6ce81de5f480d544b9a18af69384b2894bd1cd86341d3cf6cf SHA512 aa218872f50adf3989c14eacfe5493448566e73f4ba29f24e8f8d16ba8819c3e441491389c52f1818ff5ae8b7763112c92218a2394db51c25556ef91bfdb133c WHIRLPOOL bbd37276720f77a06ad067f084ae7277b80ebff21f7ae12dc7e455d2e58fabb3d72536c4a156cd2e70f0861729cd1904b0998d2169c6b4e864be377cdc8d1ab8
-MISC ChangeLog 3577 SHA256 3ee8035c2e63437535224c05cfc72cdc7a3a46872adea4cd2cd733f78a49d6a6 SHA512 39406a5b46ab7683900054135a3ef8c7427b369a3187363ac792b82633a2a1d6d072ca6e15a303391df6deb591c94dae9b7ddd217b9c192a89274895223e78b4 WHIRLPOOL f900f1b977818e8ac7a54848624364b5599f9701890480078abfed9f2f0b16b4791d1aada74bfd2188d1eba7bb8b5c12563f64a45aad3b893eb1c1621d8d4436
+EBUILD mingw-runtime-3.18.ebuild 1908 SHA256 8060b3c07f016989f90f46e318bce81f8291eaf2b87bd1825cf193fd4f294282 SHA512 7f26862cbcbcbbe4a002203369c646e9f76c1723bebdc24b5cec2f5e51c33e5c65d50798ca644dc9d62452a8fe78c3c430d580d96913920cef687905592775fa WHIRLPOOL 99e791cc42716f4d8829f10a151fadf5f929b0c71f400ac0016c4f1026fc6932f3d9697ba20286bd12381bca6f6e2191525623f0e9b23bd513a96b62a9bf1465
+EBUILD mingw-runtime-3.20.ebuild 1919 SHA256 bae082838d020ee9af83d62defebbb53c87e9f83211764aa5698ad51455523b7 SHA512 1380aabc65089197689754facc3227d3d3f24ded86c369496c3867fcafc44d4c471cf9a3aa6d18537dda225c2fbe55c7834c6704e30b4d25b6be00d12a84fad5 WHIRLPOOL 83f2740947f2e4c1ae42c36e2805231a7f6f2119b826ddef858b64d9da89ecd79c643bce5cd06d9368ee4ad6504a9f9a39ed0a6609cb5ec812bd58e863e0fe1e
+MISC ChangeLog 3962 SHA256 2d24d5d5f87a88c7931705a7e26445208a94d4058b266be421c601ba6ec100b9 SHA512 020148c78f862b425163694e3fda781333aa867ab090cd28cb08fcd6b4a4508207bc2acd25d06e80d51552556b9f3cccfb4518a394ca5e41221d18970cc3cca8 WHIRLPOOL 236089a31f9062b7988ecf4cf893cf98f6bfc3724213b96dec16efb231aebbd12b716a3f8cc64d706142ba57cb4e4ebdcaed9a6fa21da70e31fa687d6b96690d
 MISC metadata.xml 162 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a SHA512 2a857e10b277827773a6c7967e070d7bfff23d75f44fa4d4fa8a7339df3225e6dba512a865d91c9c55bdb013dafdce85dface1b845acfbb5473e232666cdda45 WHIRLPOOL f7586c1570803b3e646f0be89ba6c767e82ec6889ef92d15f62a38f1410ed9d82c36892e5e83f694471959783d0d5ad667f1a39b7eb51f2080c269d5fa23d819
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQJzYQAAoJELEHsLL7fEFW0ekP/0EbeZ5SdkxCPszP/Wo8lG/0
+5F02E1fRaFRwGNjcjOwmJOunCapgT+RbkTVT8Ejn6GWYc1hMPFe6Gw49Mo6R9W6A
+CSYW4Wdgno9+Py88vEwmo9m9CZcItxAZvl1UFv20dif0GMYa9Xbi//AZ8dxCgi+F
+uR0WqgzKcZl2saPzDB51JWSdZ1OzEK2hNoMSuhHPnGai1axVQjFZalnbe+e+AvHC
+vl9jt/a1/0F6OR/fN7QjOQeT3gyYy1pq5En/vgWE6iG1d96XH4frAIHaleSLOvUG
+Jx/Yyeljho4FtDiOpCn5wPg8RO1C7EFcwBnA0/jjw5tj2RhRySO8HInPpJME4jR7
+Ib55mGysLAp4MyHhR+qaGFkJwjYEhDTQrWIR5H6lUmBGrmjz7cLp3/HY+qYKZItl
+JFKUM6lmzDFsE9jfDXzS1NTcWXElrRJiceq/WbtFghiAC0n/2TdTbW4x5ceYJ186
+42dEmOlXmfvHr3b9OgDrRw1bqhscUcrDP/wju/7NyyK87DP6qWXGoPcjUIRkMr3Q
+5tmk2kkkrJlfaMMoAuEPloW7JTxNLD7wz47kLHKGWnptKc0IroLhhKqqLKqzG4i+
+IUbP3p2Os0HCPe893sO8hJ6keH01HL6G4ROtzZEkBDtVqQxmsLy/YvuedV/CQwpY
++lKpXB7UbKWhkOZoflw/
+=H+U9
+-----END PGP SIGNATURE-----
diff --git a/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch b/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch
new file mode 100644
index 000000000000..8b2418178857
--- /dev/null
+++ b/dev-util/mingw-runtime/files/mingw-runtime-3.18-gcc-4.6.patch
@@ -0,0 +1,27 @@
+http://sourceforge.net/tracker/?func=detail&aid=3446009&group_id=2435&atid=302435
+https://bugs.gentoo.org/419627
+
+--- a/tlssup.c
++++ b/tlssup.c
+@@ -84,6 +84,7 @@ BOOL WINAPI
+ __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
+ {
+   _PVFV *pfunc;
++  int nfuncs, ifunc;
+ 
+   /* We don't let us trick here.  */
+   if (_CRT_MT != 2)
+@@ -96,8 +97,12 @@ __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
+       return TRUE;
+     }
+ 
+-  for (pfunc = &__xd_a + 1; pfunc != &__xd_z; ++pfunc)
++  /* Use the nfuncs variable to iterate the TLS functions instead of pfunc to
++     avoid nasty compiler optimizations when comparing two global pointers. */
++  nfuncs = &__xd_z - (&__xd_a + 1);
++  for (ifunc=0; ifunc < nfuncs; ++ifunc)
+     {
++      pfunc = (&__xd_a + 1) + ifunc;
+       if (*pfunc != NULL)
+         (*pfunc)();
+     }
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
index ca291a921c0f..f9423aa21144 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild,v 1.2 2010/09/22 22:22:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild,v 1.3 2012/08/12 04:50:17 vapier Exp $
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -41,6 +41,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc-4.6.patch #419627
 	sed -i \
 		-e "/W32API_INCLUDE/s:=.*:='-I /usr/${CTARGET}/usr/include':" \
 		$(find -name configure) || die