Fix USE=custom-cflags build with -O3 and recent gcc versions (bug #480508, thanks to Konstantin).

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 45 insertions, 15 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 4f51efc770c3..2e2236729b54 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.475 2013/09/01 14:38:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.476 2013/09/01 15:31:53 tetromino Exp $
+
+  01 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.6.ebuild,
+  wine-1.7.0.ebuild, wine-9999.ebuild, +files/wine-1.6-memset-O3.patch:
+  Fix USE=custom-cflags build with -O3 and recent gcc versions (bug #480508,
+  thanks to Konstantin).
 
   01 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org> wine-1.2.3.ebuild,
   wine-1.3.28.ebuild, wine-1.4.ebuild, wine-1.4.1.ebuild, wine-1.5.0.ebuild,
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 74904732099a..22b70a31a79b 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -10,6 +10,7 @@ AUX wine-1.5.23-winebuild-CCAS.patch 6101 SHA256 34143c55618870dd31eea1e260ae973
 AUX wine-1.5.26-winegcc.patch 1808 SHA256 91c1012059b93a421b2eae9f2ea46b7b327d6d3d58ba0cb47021c8a57f6d8228 SHA512 fce9daf40a96f4a7502c249a30107c8dfc5d8edd4a171b863d2bf14c3ad46d18e4c29932ab4a6ede7da5d589d777b962d2f577f5360ee4db8019d71362c51d47 WHIRLPOOL 71cbe36c6bac87071472541b7f5cd3ed1b08f05479bc0016262b3f86e75738e467dad197563b4898f2b24fd0ab4e27c40dce04f244a3e7f5ea1582b4db1c5cc2
 AUX wine-1.5.30-libwine.patch 1777 SHA256 2f0155c2c1d11fd9a06deab54dd753c1161e32217eae82604f8c1d542e87af4f SHA512 e6d566f75632065def197cf27b5705a3f2f736a7b3bb4ae03df19fea00fd980a5b5d0517981469fef0fa5347c1c3b9651894fb23d937b5dbbd993cd292f67183 WHIRLPOOL 62ed15db6bddda47dcf74d846e15a9904c11abdf63e0321e7e2bc3197f60c819992b3a95a4395f85edeef9181a1866749194b9744be8d42bd94acab37470aad6
 AUX wine-1.5.31-gnutls-3.2.0.patch 1616 SHA256 3ce82009b05fe997b0d198ad83533026d6410811ecfc6254c1505d0b9d18caf0 SHA512 09de6ff03da996197cd6833c1f53e9f39b43fc43e02ad3b4e12648a57288c1fa200886a805e6811372e12665f9a5d463603f9a9ba39cb1392b2cf4d11f3f9a65 WHIRLPOOL 590a9206913a51eae81e236057bbed346dae8f895575dcc948ba7168edf5c0605db6278344fad727c2a828a2aeef258f72a57a12b5dca244a3b7b82cfe43452a
+AUX wine-1.6-memset-O3.patch 695 SHA256 1f04496713e8a401ba068702c5c3e104b18635bfb54808e5641a3c48a9b9bad4 SHA512 ad7231f8dedf98f9e9b91fcb8bbe72a716d78285127b0c33396de0b1e17a191f91f9a4a377c0e90671bb5f4e57bfb087ef7e80c9537c6c73b3c9bb90b3885968 WHIRLPOOL 91689c31054b896609493e2b0b4fe67e3d752d889f4ccae9c3e15229543341998809fd19a2040457e04fbdbd45505f0f2b49052844004193872713053d7239f8
 DIST wine-1.2.3.tar.bz2 17651336 SHA256 3fd8d3f2b466d07eb90b8198cdc9ec3005917a4533db7b8c6c69058a2e57c61f SHA512 602ae802aa6f94c4498ccae96a67e355a8aa5cdc1e9c1e0f29482f45a9e7cc7af766ade9f2f1fef77ee77d5bbfc5f34cd110b95db244b8cff42998b5b0cf708d WHIRLPOOL 02ac95d8c86d0f2d870c8e4c4789c1bef1ef965f8bb186de23fd3a949126ba2aadd5791d1908bdf11d946d5dc5348b085881c2594cf1b407fa0df44c1990ecd9
 DIST wine-1.3.28.tar.bz2 19626794 SHA256 9a311124a1a911066ab9d3a742dda888487ee516a18eda946be105a1d1135a38 SHA512 b8fb881cf03dce1a40a9212bc6170858ddde38cd2fc282b455ab94cee7ee2e78f5043fee72df3b1e7566c29fb8c8a43726953a8bc5eb22d3ab7f869e6f4e9722 WHIRLPOOL acb6b8b978541e1b0f95f124e95ad9823e73590229515fd40e4e59d5af21c414c4824490710b436370b4d3fda3c477d6c4b626f89c6cc90e2fcf066355c3bee9
 DIST wine-1.4.1.tar.bz2 20104401 SHA256 3c233e3811e42c2f3623413783dbcd0f2288014b5645211f669ffd0ba6ae1856 SHA512 a0fe7f36325a51d9b381ab09a4460cdf59b12b810722d28aa8e98a3d6c3de29bfc62dd0f0d4e5336bfa82a6b549e45c313a714b6d43f562c45ffadb47874058a WHIRLPOOL 81f837ecd31902bc769065de353a92bcdfa1b59b3cd53e700e345b24480260c68daf7075fec685a948a46e66e6f4470ff4158df92e132760013b17ad6690885b
@@ -122,20 +123,20 @@ EBUILD wine-1.5.6.ebuild 6688 SHA256 860ac4eac9d7f62a167ce3d4301ba1c876c9fab043e
 EBUILD wine-1.5.7.ebuild 6920 SHA256 ba73dbca14ccf03e361a4f37b78d106eb35b972a6e620a7fbfa899a66ada2b19 SHA512 d266a2701ac483c12d0a0c0a9b8a38c0a0b5347a0fc1cd19d2e8e110aa69c97c4bc04597ea9220a50513f4f5bfb4bc1976d8d1fe468eeba222bf7ef69b485521 WHIRLPOOL 783b975ad58b901774b55f14e19823b623b4d51f8518d507ee0be63147b78530ba7fce330c9cf01ae6f7c8328250d9f56e44d43027aac23f0d45edc1097257f8
 EBUILD wine-1.5.8.ebuild 6920 SHA256 773cf9a885210db414b78eca4dfaefd6948322456f568db8bdf66e36a95eed05 SHA512 a819b13eaebcfbb0c4160ece086d2ea4e716ce1d959410225ba898d0513a4801ec90a7d7e540c1e0c92dcf90f591c106a0e3a18a2c7d1125f26229404ae9501d WHIRLPOOL f73f1cc8a3e59e7d4c180ae9880f4f99d9a2e1a3186c70f2c60ce9c0d4cbf7eb943a9e4d4033ee03b71add8a5b6114374a8360cb29fc8de2c687077be5874740
 EBUILD wine-1.5.9.ebuild 6920 SHA256 d74eb399f584c52881b0d0764073a9efc6c28393b4365a133c715db6adb89305 SHA512 409e495bec92ee300b0e4e89adaf88556687eebabd5fff57c92fd523f696c45bed2d908009e0417dea761bb51946d963cf7cfef7c01e389c264cc1ef3c552621 WHIRLPOOL 486cf2a3731a5c83ca4e0ee2d82ef87af81b2688a061b26e9ca6945f1c5b174ec953a5faedda65a495f0a8628fe87a1f3b40f09e4bd48f3fc6c75e6b43adc149
-EBUILD wine-1.6.ebuild 10032 SHA256 19e2f3a17d30affef623f8de8832a3160dc66e27f5509ec8dfda87355bdd245d SHA512 3375573f17252c8314915cd30a45c8b140218692ba617a26aa50e6e2dbc1de4005d4c292783c49d61c206e3c5d4400d778a20e848e167409ffd5dbdda2334757 WHIRLPOOL a9ece628a83a60adc581dc5395bfe140eb23e7d4ef0d0f0598eded14d16fb2cdcd013885d243285a39dba32018c74858e0add08b2fa5257ba7c887563603a73e
-EBUILD wine-1.7.0.ebuild 10032 SHA256 65aab03e6d85ad49d11b5c102e1f60e73968a78a93a65a512e021c7987525ee9 SHA512 d5e4d93bed85f31801f4f5440873569b9a8cf3794ebdeda4295c8ee173597533fca26e5b08f966dc2bba301d8249da830587096aaac7f50038ad1df14b189f5b WHIRLPOOL 29cbde41c0276f394046b3b0c1680aa681785dfe26a0af4da68e96290518fa9c69a21ec15956178ee28cf1765bb059ce32e739dfcb54e6dc82b9c544ff1621cd
-EBUILD wine-9999.ebuild 10033 SHA256 27424304be175b2b0df4ee2534551fd9373688d6602f9c5a016c4b2bab79b24c SHA512 c2d0953c75a53c25464ccd236f7072c17bb6f50e1a6a3b7906ee3727e03c8dadf8f293914d53a801ff830181c281fa44e16f652b329d5be404abe20497c11723 WHIRLPOOL a960322cfd1cba4f5299f8f4c4474c925796f0b05a5b4b96826e55b82b917dba8cd2367ade9a9168c7fe1070ac16b345d3a576dbdb24261f6fd14cbed5ec088c
-MISC ChangeLog 11923 SHA256 04f3f49360c3ba36920936c8414eeb5c2395a6a4351964d5e060bfee9da01428 SHA512 ccd99639cce4589f7af388ac0108339b53c14f602a089e6ecec5b7d8279ed04bbb82ede6c05cf630739a2f45e77cfb89f15f805afaa907576787ebafab393e73 WHIRLPOOL f7711e006f507fe28bda90d75338495d27b7273e0a0074ba196f733eb94965f6cb5f10d0500d785a18affe012550d64152dbc84195c34c739141f8630cac7269
+EBUILD wine-1.6.ebuild 10082 SHA256 a18c843b9e678dae01c94f25f81006f04a11c1902437f3c7c2772b41de033a21 SHA512 e5d6207b2a2988b07855d6a03d3b691feb288aa3c5061d34765c45ef4e66fc617073fe73be6cfd70fc0894bba3a4090278ea86ee8bfc0c9286acd8c9ba4a2114 WHIRLPOOL 0332bed9d84c797de0b90f4a132e33ca12f79e0fcc3ea0c11d774c8bfee6e39ebcbb45214afde6bb52b6df637aec9e56b0816a02dd6e48528f16e699709e3ac5
+EBUILD wine-1.7.0.ebuild 10082 SHA256 ce225cfd65153003eebe6dcdf255291f7728c57a6385f19d1eb212973101c36a SHA512 a32c112bbe32c0e6d443716682afb6183159edb424550c6a0ffebf28fe64210a9d7d3c3edb7cd30a2325cf53259c811f8c72e4b3dc15d3a65a4eb2647b59b507 WHIRLPOOL f351adc9df28df1d9ac6e376fe947463d80c96a33f9d60dcf854ba2bfa8e24ac80e63a9880e523c144f41ea03f708ee631e19e9afe2855a4f3852f64cba23fc9
+EBUILD wine-9999.ebuild 10083 SHA256 eba87369d9eb70e545f4fd33aac164dd2991d723a7b0c62f36975c28b1e55d1f SHA512 627147a27b3aa4b1c8fef7c83a5977bd1782b7e15f90ccab294bf3f86d3f99abb0a4ba75d52e4e9da939b6fb3055beb3b0c4f6841a194ba95bc21991da397385 WHIRLPOOL 6d4425697737caf53b086000680d8f792aae035a7886a28819b1ac6e36b8744271fc58578160c53b039888fc6cc66d518476f1479ca5bf736bb746abd01614c2
+MISC ChangeLog 12174 SHA256 80a1f9996e4d7572985faf93c66632fc03749bbc5bdd3d92be072727dc46c7e2 SHA512 2dc891dd4c1367dd0e9da8bd2b2cd8d82ed23d57ade34a206afe7604dadb440d96a385d8bfba87a5f5139211cc7e827e9897aab763a39af53adc81334614bef6 WHIRLPOOL 6096bab6d3f9af445c530e8dbe130b44150f9ccf08c52565fa9bdb3b098ada69fcb257a40533f4509ced42449d65edfb23668539af7220134d696d904679e8ba
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
 MISC metadata.xml 2023 SHA256 bc4b00c15bc4d481b0fdafb5b2f33fb33b186dfed650954517871abc2bc653bc SHA512 923017213dbc4ff83fb2e0b39191b21c682175f56c09f657f3a84f5a239178237d835d2ac45bfff5841d61ea53f101d95ccb2d803801846f2962a6820126336b WHIRLPOOL e366d05df1d7ebf37d437859cc0191ba63cd0c4cdb453052ecb46cc46ad4838e25a00dd9943890b0aa7c6134d78223177d727237213f09bb15338dc6dd57600e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSI1FrAAoJEJ0WA1zPCt1hYQgIAIl9ARsQ+oA1au2lynm/Epzd
-5zoefQ3qcrpNsEQBXWa4SKsyMjhC42nwUo+HZhYua5tWtt1CENrAIKE3oZoCVWHI
-rrc2acpb6y0rXRxlCjEf4fOMSrIY1nYOl9r0bP6IjtxhX8T+hAzsArmiB41HFFrQ
-rUPN+dxcCdWHKcrkiE+LqeXfIqd5jPc6ZN8Cdwx+gzr8u2j2SfYAK/S2kqOBKw/1
-KmJtMXthaHfGv5rMmticGevmtPYKGJ/kDkDjdwOL+fbmaPEkIWjjk6VJT6U2HkIZ
-2tjX8nA8Wd9dKVzMc5c6wXDR3O74hawg366ikSZFHGx7OHv7WnumqFP2CJOH0uE=
-=DM6Q
+iQEcBAEBCAAGBQJSI13oAAoJEJ0WA1zPCt1hqhwH/1fEHu/sA7t5Yy+zKmyS/X9a
+O/8VrcopwMD5qty9WSPuJQw70pBCmL1RHAv3TUITRD5o53aQfmGPgelURohblIi9
+/YwfRSJpHb8oB007KcfyA6ehhR1kYgnckmQU2MIlEOl+/sYd3xeACCNqzdI1PlAU
+I3QI28RlEFT2lNUm7wzICV+Fs2rpKuwCJfjUCCt1nuxLvO2d9+HFWQ5zAK4wTufB
+hn+NTRgLo+B1d6leUILKWUJUGUtsCD3YO8X4FGC8Plr1xiHre78II/L/HuOIDtIm
+zzQJYErsmU6PdU2oSopgLZKtEC+g+RCeUA0v6deSbwNGsbV+/icQEjSk0pyDsoA=
+=OjES
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/wine-1.6-memset-O3.patch b/app-emulation/wine/files/wine-1.6-memset-O3.patch
new file mode 100644
index 000000000000..75372f869141
--- /dev/null
+++ b/app-emulation/wine/files/wine-1.6-memset-O3.patch
@@ -0,0 +1,21 @@
+Avoid "undefined reference to `memset'" error when building with
+USE=custom-cflags and -O3 in CFLAGS with gcc-4.8.
+
+See:
+
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56888
+http://bugs.winehq.org/show_bug.cgi?id=33521
+https://bugs.gentoo.org/show_bug.cgi?id=480508
+
+diff --git a/configure.ac b/configure.ac
+index d8033cf..fe7cc7d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1767,6 +1767,7 @@ then
+ 
+   dnl Check for some compiler flags
+   WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")])
++  WINE_TRY_CFLAGS([-fno-tree-loop-distribute-patterns])
+   WINE_TRY_CFLAGS([-fno-strict-aliasing])
+   dnl clang needs to be told to fail on unknown options
+   saved_CFLAGS=$CFLAGS
diff --git a/app-emulation/wine/wine-1.6.ebuild b/app-emulation/wine/wine-1.6.ebuild
index 089f5b7a5482..f08acbd76a43 100644
--- a/app-emulation/wine/wine-1.6.ebuild
+++ b/app-emulation/wine/wine-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.ebuild,v 1.4 2013/09/01 14:38:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.ebuild,v 1.5 2013/09/01 15:31:53 tetromino Exp $
 
 EAPI="5"
 
@@ -177,6 +177,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
 		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 		"${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
 	)
 	[[ ${PV} == "9999" ]] || PATCHES+=(
 		"../${PULSE_PATCHES}"/*.patch #421365
diff --git a/app-emulation/wine/wine-1.7.0.ebuild b/app-emulation/wine/wine-1.7.0.ebuild
index be0f1883fb64..d2194789db68 100644
--- a/app-emulation/wine/wine-1.7.0.ebuild
+++ b/app-emulation/wine/wine-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild,v 1.3 2013/09/01 14:38:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild,v 1.4 2013/09/01 15:31:53 tetromino Exp $
 
 EAPI="5"
 
@@ -177,6 +177,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
 		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 		"${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
 	)
 	[[ ${PV} == "9999" ]] || PATCHES+=(
 		"../${PULSE_PATCHES}"/*.patch #421365
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 1a4cb2263047..0adf7cad59ce 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.150 2013/09/01 14:38:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.151 2013/09/01 15:31:53 tetromino Exp $
 
 EAPI="5"
 
@@ -177,6 +177,7 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
 		"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
 		"${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
 	)
 	[[ ${PV} == "9999" ]] || PATCHES+=(
 		"../${PULSE_PATCHES}"/*.patch #421365