Fix build with clang, bug #542676. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/67 by nigoro.

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

3 files changed, 31 insertions, 18 deletions

diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog
index 03d71d0204de..a147de0320a7 100644
--- a/sys-freebsd/boot0/ChangeLog
+++ b/sys-freebsd/boot0/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/boot0
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.51 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.52 2015/03/15 18:18:23 mgorny Exp $
+
+  15 Mar 2015; Michał Górny <mgorny@gentoo.org> boot0-10.1.ebuild:
+  Fix build with clang, bug #542676. https://github.com/gentoo/gentoo-portage-
+  rsync-mirror/pull/67 by nigoro.
 
 *boot0-10.1 (08 Mar 2015)
 
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 70871de7b77b..773eb1f45c83 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -25,31 +25,31 @@ DIST freebsd-sys-9.2.tar.bz2 34386743 SHA256 5619589783d0fe915b6e74be050c10fa06c
 DIST freebsd-sys-9.2_rc1.tar.bz2 34377450 SHA256 0db609374f4922e026779331a3299cfe542049014e9bdc4de0990aba539b7518 SHA512 ab7e6301180560934da38a3ef1de3623f0e42c6ee5ba2695754784c5af80ab8367b5d5412bbee51e8ba963b7f5835be9c3789b66b33be338bb9194a9de15b2eb WHIRLPOOL 7afbf758f0a02ea0337b58dd8f12876b8b58dbf73d8a3c237e1bfe2c77b72f319080d91a52ef2918e2c133af5924b302712fcc76ebe2cb334c561f18511698b1
 DIST freebsd-sys-9.2_rc2.tar.bz2 34381761 SHA256 2cf28a18adf0d22c0d141f2ee0c7a8b4167a232b2f488389a1b9777c0fc3259f SHA512 1ac4ae1e04f44bbe9687722fc21633e7ea5e0990327f079dfb3239dca1fc6f92a587e4f5d9fa4ec6112b99ce57297f5394303d5907b04f7a3eaeff7a1c71bac0 WHIRLPOOL 734a3911efcc3253bf8e04eb57130b227b38f9e8666aeb50fc608af42ed8ca080016b3062d59ddc585890693bdb64d4a90a0fa7287a0bc62ede4ad445140223f
 DIST freebsd-sys-9.2_rc3.tar.bz2 34386428 SHA256 86fd03137f39a8544174dd26f4096da022c1ecfa447a1e7c9e4e241428b94947 SHA512 233181db24063e6afe1dc3e17280e2b89a39529961814640bd52d6efa1bd9f9212ab2a467266df7cd1c52654e1759f124df5d4fa439862397816623d46f3af40 WHIRLPOOL 4d7a065decda622550b16b2583b133f9b3d42aca4e6707a53012bbac9e5eb62b2fbdfc84d9cc0b666c9685e8f9abd6c9b7c9f46ce23e7b16a90a05530f45cc9b
-EBUILD boot0-10.1.ebuild 2268 SHA256 9edc2eb5f55ba31d2760f9ffcba04f2bc4a7fbe64c26126efacf1013e924d123 SHA512 9de2989b0f23e68dea569731e2bb061cdc16ad06f9619802b3b658894b508dcb9d6158d22fa13571a96ab8ddf4056dfc4d17891270482fc7ccb8ff38360603b5 WHIRLPOOL 8f4558fc3fd4b72a32dc668b615d603cf7b87e3512277019f631d3f6adbc504a15d5a5196a3fa5667026a95d372e478093ddfcb44d04575fb0cae24d5ba01c14
+EBUILD boot0-10.1.ebuild 2444 SHA256 924259467a23a8f251cba579d288184a2b466b2eeb3d882c5b15029de9037d4d SHA512 bfef27f7299ee9247930956e5334e8dc56a3073531ec78e8330802c6522e9731d11418e07cbaa587b869d23c7204255e0680f40b0fe81063d975e141f3a03166 WHIRLPOOL 9dacc81df2be4ff1fc02ea02799cea85dd86223937443cef639b623042f8978239c92fd3efe55c0f57e7c3ec3edaaae1f91e7e03ceb669cb2a622b27523f5c92
 EBUILD boot0-8.2.ebuild 1289 SHA256 40e0e4d5a35139168f684a17063dcc109c2a8b51e24713d90177a057eeba62ce SHA512 79785ee0f577f744dd4087f69333bc76d9624046526d4f9a36f2be9d27e8b68e3d3bb488147996cd95a034ab288274c43bee8ac444776f40c2e9f2f3ed3edb91 WHIRLPOOL b9c59ec699020212e0ce439bde6b3d4acf899e2b6620ce3261f537e1ce05108989b8cff38abd1ab4afc1586e1ba564d1221e420d83c6509ad24f260e1a803d15
 EBUILD boot0-9.1.ebuild 1586 SHA256 f48b11c0c8cf859582a3ad16d7b8303c645b8e29b1a63d024e90bc014ff1348d SHA512 3c034b9f9b99636e5678ce7bdb89dca59747f8a28473e8e7592e8cb209ee4671b739ee422a633f591d0b007a1e000911c38b4c4dfafbdffcea2a5be40d0894a1 WHIRLPOOL e9ebb57b09f5672e9ce327bbec785c1dab4b88ac17a98c45830587b9b1092012b09603a747e6d275a1253e3189c66ba1f00ebd66b2f12a836516d4d7148c996f
 EBUILD boot0-9.2.ebuild 1827 SHA256 f56f941b2bb031b878932674978dca6f053a24078956a41c6dcf0926b4d95f7d SHA512 6002fa958e2dac83fadfc4cfac98870a621047382ae1cbf1c0f99ca75a2b7dd890f563e478fc1694d9be3d9d12457cd6da3b0221ff837f13d5d2ad43329d2ded WHIRLPOOL 089284369ddc1598916f8644b6516d0ff95a630510f92adcf7701fd5da8bfedd83bdeb1b79bb1c2ffdc37b93b9a35f9ae89e29af338b1d494a2972c555f72ef5
 EBUILD boot0-9.2_rc1.ebuild 1789 SHA256 1c76406d6413c7e03d8146b25363b47d0e14c7f980df31fdf3169d90ee981af3 SHA512 9119090917584e7fd98e24e68355090e758f769062a96003cf3062c2f28e8ba6b44c07d7008b82c96b34621b91f9044f0169413d4b2d1f4febebae12e5956c7c WHIRLPOOL fafea019fa89e3f64873e0186038e1754ae4fdbc63ede73be2d77c3f8b08f92919fccfcfbbe22a2717691ed173f74f22768c3b66635592ef27622ddde4643253
 EBUILD boot0-9.2_rc2.ebuild 1789 SHA256 8ddb730751849f21c5dfeb4afe10db7725248f2bbe0c6e3c9606e11db5bf3e8c SHA512 27ff9c67ad856060c7ab28559a7351155b085c35e267f05fb2941e5f1791384987d62b35fc60be59ee779750b94f556d1eb3395e431b051b9e2ec7410de12ce5 WHIRLPOOL ffee3442b946c34bed028b5747136064240fc3048f3dfcd2d76271af672c5defa25b5415aad24728bf1b9779449eb20a4c764c1bb392c1c0f1c1aa788c785799
 EBUILD boot0-9.2_rc3.ebuild 1789 SHA256 490b8dbac7e715ee337a5d834816f0f474ddcbb5f7572cd8088252ff7b56e74c SHA512 4c8f925ceecd5c426e1cc4f8c0a470251f1367964756976b2bef38efe0adbbe859ac4117f13470bc8c0df2a2a15d05dd3df41c2990d8af185afbaa4efead197b WHIRLPOOL 0566b8192a80126085a34de53fae9413b43235bbb43fd4fd06e513a1f2d13d15f8588626d064ddd58a33077ce17d13b9dd52ce5836e4079209fc02a414686348
-MISC ChangeLog 7440 SHA256 f798c068dd7d1c91d15b50c54af2675e73939fcbc8bf9f25c9d42ddac46b87d2 SHA512 2bf57e281a8f26b2ce917dddf7df4f28385937f869e6d138676746b5d461ee6f22be3c3801de7fe6e853468200bf1b31a76fba9606187cb3dff10bdbab8b7a39 WHIRLPOOL 56c1bef1fc042711402891c47f7d6bc5097078b9d2f60851da9c960e9b273db2714ec060a9359475ff0054dfad6f5996a4d63c54bd43236d796f421977ca9af2
+MISC ChangeLog 7623 SHA256 d2bf0558b0e94d64346e03b18e23c17e47db1e60343613d579703ce47b83ea5b SHA512 15d849b7fda286b203744e772fe91246acc2a2cf9b3ff5481dc4361c6f1100964a6fd9ed368159e79ca8a14c21292491c0c0bdfd6187f56281056068bf514946 WHIRLPOOL fa26404fc1e42ac9a19edb54fc6a4e4b82602e49acee5dee307f674e3ea1c8a603a841c1ed33a5867bfce1fdb8cc329de4017fb9c3c3608bb096475517ef5cd4
 MISC metadata.xml 295 SHA256 922f6d4e6468957777d39f1f596b0770e5bae7372d0bf3165e0cff93a838b644 SHA512 5543bbaf2b1d8532edb50462c17ff024af0f34466ed075888742ea0408a3518788684c74738bc2037ebadcace35d5018390dc81f08a2b29a127b2bbce98d73c1 WHIRLPOOL 26819d164c3bdad8c1bea131f5031165f8135b40faf0f2df40bc9b92201eed989975d021309c739f09c753a42ea3ebd31ac203ed32e1ba09df8f8d5b2d27c8d9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU/FZdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVBczwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZONMEQAIvbcem8aOWzwR9X894fymb8
-auhxTJwqWD0ZP1OOyMXffx+Dp7oEFU0qLKdqpUyW51YaB0E8BWoSBD0qsFqcpLWH
-1GyesTLICIF1TsEp6Ty+39XDW4esE6QJPCmBKa59/N2miLoJKJaF+7DoJvU7tdVD
-blgqb2tweifTwTVQkuq29hHgUyth42b0xhgetgI8zZLT3Te80HWbpjU8X14tf1NH
-tTBQe97W1uUgDVpvsyIIHN9Pn9ND/PHxX1b0a/l3km8K5/UNGVxQ0mXpv1bHvax5
-AAasSTfmzCF+2FKMAD7pRFClSVpDxIAuvBswp4aPSlN9kEUlr5h7/jMDw8baXvjz
-wvxpuYrkZYM+wfWF4OWhGoPl1v7i0D/luEUtnNk6w4aoYGD6UmvyjPW5LpfW2mnv
-UuV6Pc0Vcn1XB6YhHdWJ+jatADuwaJLOceg+GTAl8GT2AZq+Q+O9qYLrdDZFQXGk
-KcukLrD+8nbP4THYBQHLe/q9YfAhZ44knOZrqoACRPWI9ctRAiafWkr+a6wCF+w8
-DVBVL93XRZH2laXN+Fdk8ZFGbeZEV9PV2gWW/gp9fT4LzO1EiWi+2XX8HsUYCGrW
-E/qxGN2A88YztA4Y3OimPyCQ8KyyaeLCUC8xcsC1pmFVPosMttO1lVkey7GA1NLa
-Df9mPitowX7ty/74wZ9k
-=VdXw
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOaSEP/3dqeBrdlqzhMhcZyIFNLpYi
+xSgrbloQE0Nj53IQgA33KgpY51pQyczUz0p/LQ/gdzqLauPOqr1/JW5lHrgR4W4F
++ft+2S0u/teHBaB0iF3cefEJWwIUJklUSJnx42ALY7K7NfjmLbYTCsVgU2eOqEWO
+myUlh5OkZoVOD98jiP9WHbwOzfBi584UD96fx2YTpjdOEaNgIGGJaPu+Q881/DqE
+2a+SXoYg75bACqxbKU9tPdl2/T/U+RNzuASGdkl7yflq/L3e8J6Kl/hPQHFIjPLk
+3m6SxkVCLyfmVb9s61Q16I4SvFZz03I9uGGuXUkGwmCQGEjFGhT9hVKhHjDOr5SF
+IWkDuzRBqZ542Kbl0m5AOOxDejioZb5Tl2FDXeLk3010ttQ9nKeU2jAItSOCaJFl
+pd+nCQrqE4UWvIP/CSn4GGYMeZqnjzrQozu0QLpH4HFFXr48xnMAV204QPqWPqPL
+kwqhfvmU9ZWMG8peheHZJ/qqJbxI8slv68nWnbfz/bSdV0IoDqznm58GkSdO4rNk
+EKlo/ovvgQzIXTcG7n3bWXt5Pek+Kj3kDlSaJGhadqemgctUPIBl115vklU9RIO8
++JlDAJeIZMeSqRx/97PNqu7yyaruxLPqgyUd+P3MZ6DOBDpsBQTPzojSGfvQXpkh
+8tjHGgGRk5KjsXlTgTDa
+=h7rZ
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/boot0/boot0-10.1.ebuild b/sys-freebsd/boot0/boot0-10.1.ebuild
index 142d11f316c1..daa653e586f7 100644
--- a/sys-freebsd/boot0/boot0-10.1.ebuild
+++ b/sys-freebsd/boot0/boot0-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/sys-freebsd/boot0/boot0-10.1.ebuild,v 1.1 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-10.1.ebuild,v 1.2 2015/03/15 18:18:23 mgorny Exp $
 
 EAPI=3
 
@@ -62,6 +62,15 @@ src_compile() {
 		cd "${S}/libstand32" || die
 		freebsd_src_compile
 	fi
+
+	# bug542676
+	if [[ $(tc-getCC) == *clang* ]]; then
+		cd "${S}/i386/btx" || die
+		freebsd_src_compile
+		cd "${S}/i386/boot2" || die
+		CC=${CHOST}-gcc freebsd_src_compile
+	fi
+
 	cd "${WORKDIR}/lib/libstand" || die
 	freebsd_src_compile