Stop requiring clang. Fix failures with recent gcc versions, bug #477914. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/148 by nigoro.

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

4 files changed, 46 insertions, 22 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 51048f824036..cc7b0441ff14 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.113 2015/06/05 16:43:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.114 2015/06/14 18:04:33 mgorny Exp $
+
+  14 Jun 2015; Michał Górny <mgorny@gentoo.org>
+  +files/freebsd-sources-10.1-gcc48.patch, freebsd-sources-10.1-r3.ebuild:
+  Stop requiring clang. Fix failures with recent gcc versions, bug #477914.
+  https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/148 by nigoro.
 
   05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-sources-10.1-r3.ebuild:
   Bump to EAPI=5. Use upstream tarballs.
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 286db6faff44..d1dd36fe86b2 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX config-GENTOO 73 SHA256 04a7695383baa247120cfd39f399b62c9d9b66682b79bc9bc1117f0aeb95b858 SHA512 436e1e1cb4077488cd1e054a96598c1c6dc2fda5c060d2d6c1bf2986b534016c86ea2afee0dcf883b4bde6946625596ea474a273013b18fdfa5538ebcfe6ea54 WHIRLPOOL 467ed565c0c6b508185f3c7d9a2031ce1861573614ba6fd5db7d6825fdaaabf23b9be1daef035d7fea9fa66f9d92ba17267085e894db66d8c9f49ed4ca9f16b9
 AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf
+AUX freebsd-sources-10.1-gcc48.patch 452 SHA256 26ad0753e59bd7e45f957cc98c8a11c8c1bcaf89ed55898b4efc6d95e3943671 SHA512 55e5249ec8337d880d96fd9429a0ffe5663c6182996b6b2ab8d19fe9d5168a0042b81222b2bb89de6d90f98d042b593fb40a7f4178ac739f681f84c2d62b5c96 WHIRLPOOL b6ed5ad4d7e444c79afcc0a14ce9fc85fddd5d1ae6b1d7dc8aa3e4949bb598e0da7a0d95025ba7e3981fc0af741c52e3c84fc81cba00bc79f59ab510afa85441
 AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc
 AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14
 AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 SHA256 7857fc90c6d5ed28d848146d50ab5bcd01f79ad3480ad1335929f08e45afbc44 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7 WHIRLPOOL 6841f24f2d3ff569ff0e7bd4d628955c9b61b41aa039bdd1e736fa82f737842101c212d8ae8961d1db335e53ba332cdbec1d021a4c57520e426926981bca4512
@@ -44,28 +45,28 @@ DIST freebsd-sources-SA-1509-ipv6.patch 872 SHA256 318babf3961a2b99ea5453a5e2b65
 DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
-EBUILD freebsd-sources-10.1-r3.ebuild 4655 SHA256 83561b1fdb87adc1f5acf4e069c1e1876ef97312a6e517552301d06f56099d12 SHA512 1434662680f95bc1391949cf1a0e99f8e610b802849ffa46169505a227991e970f8d18fbdd1be0247566a3789fb4d79fa88489123ab0c67dd32416831e1e1385 WHIRLPOOL dad9bc84e77482e2bc9735311eb74d3808bf46b118332da3bd334b1d5449131021fac6a2d23d89eff301182555bf7ef6b033b161ec0ba4a640dd8c331ed4c56e
+EBUILD freebsd-sources-10.1-r3.ebuild 4718 SHA256 4ac6d4fa18ba2b8965bc65d7a1be86fa023de302ac4b0294bbf5259bb2ed984c SHA512 1a8c549a88de5b3ae22ef88fd8b59c16111c588a614b1328ca1fc94763ed482d4d89af808d5b5197ca3c107e48f5c3de089b07c848fddb935f6a2f698ca0f2c4 WHIRLPOOL a443c06023eea9184ff09366f5f0f6c4db1ea78d1209475fe8714fb6870cfcfc7170248a718662b32c85446bb3580c51371b3a95216e4082cfde735be91de043
 EBUILD freebsd-sources-8.2-r2.ebuild 3801 SHA256 1766a68e4f3191690a805d89280250a549fdbe0ef08ca9962c0aa46256ff0762 SHA512 85b3793d6042a4db9409dd42e90e37e67d880d5ff5996834b467662c60febab7a63d9f13176b549fa93a8aa4ae212f80e42e0742c16de910e5f3c85b06ef3059 WHIRLPOOL 91deb75cdfb47e561cbf842a2ca70be4ea4af4216c1a97e598f6bdc3b9c796d822c7ba5cba8edced1a6a43a2a9bd15e7d31e8d9b292965d24792bc88a557ac15
 EBUILD freebsd-sources-9.1-r3.ebuild 2648 SHA256 40075f5d40a1f1d1cb53cce9fba58a45cfdf3fc358b379ff5f502bda21e7c010 SHA512 f51c6eb2d56f8207ecf77ccd7630e5fa3c78db6d30bf21dc84d0c602643a68e0b10e67824c161b198a8d1311ad34543ec5ec1c71008c86c21b71c9e05a417272 WHIRLPOOL 9c5f574e177e52cca80466f51a27fa6341c29db4970a70e0d9ab26a76e66328fac70c0ce99df63d2ed8ee26f6153da9f1a4a94c76f1a0aa792094e19e3524e00
 EBUILD freebsd-sources-9.1-r9.ebuild 3189 SHA256 cf16bf2ff54bc8ca37e42581c2d40cff0771c4fa527d08ed4c440817fe98d267 SHA512 a918e8f72abd21851c547c8c86843f8c89c3b1b3e92f7d34a30fbfb7681a4b4dc30690c176b0e8f8840f1ad082bf48de0eeb199062ec475ca8a5708fa8071e90 WHIRLPOOL a00bb3b64f4d0a2952a0df5f4b3bb82103eedbf29adad611f7090fa593f247dcc025613ba1f49c22698e3aeb396bf93843679490071b4e04bdf8498ddb4f09b0
-MISC ChangeLog 29006 SHA256 3772f43cf81002abb307f6c9bb842de844ab953f771e6f6e787146d84b557575 SHA512 2431dc684cb69ba1f995a1e7a032776d6ef2d87fc6e339ebf7ea6eac7d085c58ac72fa140b23d8b16862e056add4b340dc4b639e4ba9207639f850fbff8ba743 WHIRLPOOL b869fb3a066755ad83e672455abceea0e7d9d6a0ffff13bb13b3add2890fb56570ba898c176651b07716e8d58b2fc553e55508ee10ff9bbfc8ee669fc7ecd8eb
+MISC ChangeLog 29284 SHA256 d6e55aa0d4518dd8d8ca60a3a5225f5998aff01fe9c10cb6cfaa35f492136c00 SHA512 82bb87d54a7a69a3775555da1c1db74f6dd3e506732c19ae7d6b28f302482870679fd09482af8289d98882c3de969c85200190d984e3d9a228a2478b82641087 WHIRLPOOL 059617ba826849f06be8884f6d63f3a564591ea9fe84421a297dc36579e42ada80b4b7a56881e093b67af2a001fde9674cec61f1a54e7bd18d5d2735648feb19
 MISC metadata.xml 354 SHA256 1febde9432e112ae9f645a26ede3cea3720e5784b444c1b83425dd3288f5e729 SHA512 430631962f1640984e674082d12d2f59fdf1bb5013c9c75e73b47a7d499f1bb1b5e8eca3ba168d19f378c85f5bc599e5ffc8cb80a314115fba1307867076ab6a WHIRLPOOL 483f77a75637d9117fe55656e32c7295352fb484bdd735e6e530ad87b453b860bad26716f5e99cb8ea78248e0f7f8e4d3d869d9073689d72fec1cdf26d04f7fc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVcdHdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVfcIyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOip8QAJiIizb2OsVFdV+UUNkELzpF
-hMVq0rTEe2Xg66FdJrJLgvIdeEhNaNGHAoZJ9pShBvfGv22maDA7kdrbSdusfyPd
-Wku9G3Hdry4wLzX1oqUQrB73a+NQtcFguFu+7m5a1uL4uwASjASb49TXSGS0LdhS
-8W10dQMLPwjSxAdVSlBpXZKutifxTeEYMWYStkqPotcI0/URya/h/K20LeazwEYO
-vaJ7y2piB218BhQJ2hQ3s/gyrHJxXo65WPUiFZ1r/drJRqbuGYzAyTJGdx03bT0c
-cKvoo2ZXsiOGY+1JmeMxoc2pC9EmaXMzG3KOjqx5W3Ei3aOAdTEg82Z82YAAuExj
-kupQuAzTFll48oP1aFkiUKTdlTB/SjE2BTmXBdrwgOGQXcV2iTMuDWdKvhadmEFx
-EVu2PlvNVmHq61SbtfSTjz4gmKcnvYAJej0SnmFnoZoSC205SsWudMER479na3y8
-AIEPIaP3eFYkIZMLewEw+s9uwYoKvqSc+s8gdSSXdY7htixmFvV4fYxYtnW7YJfv
-y8OKP80NAUj3a6RZpKJa/pWXfjyoQo2ZgtOfJ4lE9+iiNCj0qiRRLBpntbtUo7SP
-PI7Uvyrzekh1gd/PiMPFIO6f0Mr3cJtd9q60zX7mjbc8nM5RKwsiSEL3rzpO/I2J
-2b0sZaEb4U7lo3mEyqYs
-=DmoI
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO9uMP/R2XDK53v0ydCjqiWzrPs2zM
+H+W4pcqoqOVx6gqGkaI5rb+kWzlaPIRNRERItPJnE4L+5UQLWLdKW15Kqov9oMko
+nN+eYe2OgMX8k9fGtkvWH8B4qz8jlFjpKB1BT3fFm1uuwVTb5xm/aW/6ms8teZ5u
++rxAidLV89TpF5hn607+/Q6VfKsZh6dNheP475iNxs3nGBe6hOBmLC4QRnOGMLub
+ST+FjfgOtzca1A2yHmxn4ESPPZCdzj0GqZTG98L7Blu6LMRG9aK6kgjFvt4mL6HM
+KsFlNLs7n//78fZC5IDKbYmktJiBWDmXFZHnUxH7U5/1j7+/LC95sGlHIubgAZAB
+gcEXMsRufs4n5av7I8h1KvP4eFREOEfRMfyreT0xZv1K8aoqij143gOqElz8QMH0
+7Lp4597N+BGPZFIRBW2ZjXe46PCCQukgNPDBsodb/SRgqmXk7mLAJu7f88fHXNnC
+q9OdjzRC5juCt8xelkRNmhC/4KUH3YIuXNfNtSlHqGQs1GxsASQxgR9vikqRbeiQ
+71lbRsigEDuzJyjdKsmx9Lp/bYqBB6/x3qRuNLbEW7tvbsK0gzaBzARaDpjxnOLJ
+nO32K9nwVbJKQg8S6mOVycZ7smnASIeANFGwZQ80ClG4UX2hXz7XxBWEsvPahTP7
+cQenqu4HPOu/jAh2ZJWg
+=Spym
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch
new file mode 100644
index 000000000000..5cb4cf809b12
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch
@@ -0,0 +1,18 @@
+https://svnweb.freebsd.org/base?view=revision&revision=281606
+
+diff --git a/sys/crypto/aesni/aesencdec.h b/sys/crypto/aesni/aesencdec.h
+index d4ed8b3..79847ee 100644
+--- a/sys/crypto/aesni/aesencdec.h
++++ b/sys/crypto/aesni/aesencdec.h
+@@ -27,6 +27,11 @@
+  *
+  */
+ 
++#if defined(__GNUC__) && defined(_KERNEL)
++/* Suppress inclusion of gcc's mm_malloc.h header */
++#define _MM_MALLOC_H_INCLUDED 1
++#endif
++
+ #include <wmmintrin.h>
+ 
+ static inline void
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild
index ad916a185040..22d953f9c5a1 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.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/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild,v 1.3 2015/06/14 18:04:33 mgorny Exp $
 
 EAPI=5
 
@@ -40,7 +40,6 @@ RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
 	!<sys-freebsd/freebsd-sources-9.2_beta1"
 DEPEND="build-kernel? (
 		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-		!sparc-fbsd? ( sys-devel/clang )
 		>=sys-freebsd/freebsd-usbin-9.1
 		=sys-freebsd/freebsd-mk-defs-${RV}*
 	)"
@@ -58,11 +57,12 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
 	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
 	"${FILESDIR}/${PN}-7.1-includes.patch"
 	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch" )
+	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
+	"${FILESDIR}/${PN}-10.1-gcc48.patch" )
 
 pkg_setup() {
-	# Force set CC=clang. when using gcc, aesni fails to build.
-	use sparc-fbsd || export CC=clang
+	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
+	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP="
 	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
 }