Apply upstream patch for FreeBSD gcc-4.9 build, bug #548444. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/140 by nigoro.

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

4 files changed, 52 insertions, 18 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index d8a43e23608f..76304464a81c 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.250 2015/06/13 20:51:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.251 2015/06/14 17:56:07 mgorny Exp $
+
+  14 Jun 2015; Michał Górny <mgorny@gentoo.org>
+  +files/clang-3.6-fbsd-gcc49.patch, llvm-3.6.1.ebuild:
+  Apply upstream patch for FreeBSD gcc-4.9 build, bug #548444.
+  https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/140 by nigoro.
 
   13 Jun 2015; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
   Clean multilib_src_install_all() up.
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 32dece4f49bb..02201feaf353 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -11,6 +11,7 @@ AUX clang-3.4-darwin_prefix-include-paths.patch 710 SHA256 f76311dfc5fa734a3a72f
 AUX clang-3.4-gentoo-install.patch 3228 SHA256 051799f114102aa46717dc4a7224c878f7511b69a06090c501abe157c6025c5d SHA512 35127c66182ee1f698bf96731c11679c3fe162d9dcb524c06467598b374fcce94dd0484723acc0072ab1565c581e2fc74d6b7246484bfd9bf1511eb419a85c9b WHIRLPOOL 3d1644da31e9278bf0983bcaf1947b99570e71366b6cc868020c5978037795c27ae211c4d32562dfc1933ff2a4e9f8c0aab0248ac9c6c69fc954a830502d3f68
 AUX clang-3.5-gentoo-install.patch 2166 SHA256 e359a219f2d0d2b88094bbb5ab91fd50d9662686f77e85b7ccfb8d1c4a6fd39d SHA512 07e5b3d4131a7d58577bcb99a82c585258c98a38e71b7e8dda058b467a558471e1ddeec5c9f5492f5d17e280cd4b09e49338e0926dd2534583bc8a2772bce26d WHIRLPOOL 5582b2015b4d3e845a45bfda08c156683df11685170f253f79ccf016f2e771b016d213417d83068f01a41bd8e0148474711cd6f9b7187e758322e9ebb9c390dd
 AUX clang-3.5-gentoo-runtime-gcc-detection-v3.patch 1694 SHA256 24691db819d08f87f0144a67900ae6797c0df4d180b55acc5c377d890ac2e72e SHA512 a34f694560ef0c7366ad0dc243a479afc74b6122d624b8681538da69c70d0d1869245a89c61d49add890c5f76134281470f5e75a59e6fc9ac963230fc56fe8e6 WHIRLPOOL 4f4af09e08c7d5af89558e77d0a2a4542f77ae505e9020ca6e48e20ef71c4db6016ed0211b2a303b756994f62949c91c216cc2f81b16ff65c71414d354977c8f
+AUX clang-3.6-fbsd-gcc49.patch 1016 SHA256 550862df82d47bd54e8adad7b8ee5bc8eaf14ed4bc100d09ba01d5416ac624b5 SHA512 4d9fcb9626774ea1a06494ee55efb5d6232a33874996a90fa29003ac53f9b9dad2885281a9f9bc15fdf0f0817c351cb6d8a4151e5f6ea12e28d383ded1429018 WHIRLPOOL c0140413a4944989efc5ef9c6ba33d10f43add5e1d8c7a8438cb04c18e764c3db26d65330d6a1570940a93cf4d43de6bb1f5a5640384faed3ea43abfa52b3d5d
 AUX clang-3.6-gentoo-install.patch 1660 SHA256 74cce23945897ce2cfd3931b08695d534973e32a0d104ff942b2f5c500ec4ad7 SHA512 77e2a2dd82fd13292edced8c9bba911579f2b4984a64223e8c80f41b5605220f1433beb6f40e0746163d894d4405296e1f40584eb069f960866df97e6057b569 WHIRLPOOL 4784e8da4e04406a1261c9a539280c90936141b6061e567c70f9e4b566d45e0275b2513d66c03a5473fee6f434e0cf0242e7ac21eafe59a8c26c7c6bf7040876
 AUX cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch 1404 SHA256 c9692562264ee6a25c3a2f25c990fab763aee36014de3ef95aa1d35a89aa0c0b SHA512 41dfe489adc0a45e4ffd5961c973fe94934d542b1474bb2dba4320b75ed6ff22ce0ac4b590ff20e626ea7c14617c9703ce1fd4d8d6bf1bd3b26ab0adeea373f0 WHIRLPOOL a9d84dc513118cab6310ea46c7b2e67654c81cd3c783d5db8e9ea3657fc1658e80fe4663399d4e35f99294ea9a98fb422e9077a6c8b73a3a98bbc8b282d1e9ad
 AUX cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch 954 SHA256 6518c1a1fdce0371aa1a9dab790c0999440e7971ab2613f6d348250ace9310d2 SHA512 e4721c13add5f65126a3d84b9b66ce7086f435c9d2a729edca7bfc3c6f185afb2b5422c7f5045c1a3a4f82c5e3d5616b647bfad9975bb73ecf228235f1d9f588 WHIRLPOOL f35f09b2d29de42dba9c28825af5feec562860f25206589b0a9dcd1daea27c317da1385bdaa5c562b2f4c0613071c3bc1fbfcddece97cd13debaddd14324d552
@@ -98,26 +99,26 @@ EBUILD llvm-3.5.0.ebuild 15233 SHA256 dc10d2328a002697e1dc3aa20e9b2fcf17f2254f69
 EBUILD llvm-3.5.1.ebuild 15323 SHA256 3b673170e10b2cbad34d877eeaa870f7d26d777b855019a4a01e06dd339d1909 SHA512 135e621ece0d5897efd22413f2654d5257b1c6b5d559bd5ed87b69cdf7e63c8631d74e01a1cf81e5763fb012d01318c99f601da32c894ab5303f0f21c6fb643a WHIRLPOOL dbda09e5c18c8beb2078d146a478c410be855473666623ccf8e555915d24e315d2f5a497b04db0f440594453505fe63701f34b1c6fe4fe1e0f1cad4d71cc88ba
 EBUILD llvm-3.5.2.ebuild 15351 SHA256 d06513e37ce4a492610840c9788aaeaf86fc184ca7ba6d7f9d897a5a1fc3aa03 SHA512 874c560af1c62c54401bcae868973b47576115951e353c1f324b88465ec8b19e1f549c8e8927bae6f3fd65a458f76d5903afd385de059724998a881e18b06d84 WHIRLPOOL a2fe4a0bef21d1be6e9a0e77e364c60af28ec5cff6f5429b40d1b821e462ca36a8a099cc7230e195253b77bc1871bd523f4f3e70cffa17ea3c318766fbf7879a
 EBUILD llvm-3.6.0.ebuild 15310 SHA256 213f00e1aeb57bed52823f43025c63a820a0aa92421de7ec2d539d61bb212577 SHA512 13be6ca07c5c90dd28656261b4585aa3810ab86024949d5865892bbd58508d9f77eab390aa5a5288c84aa3e2ce8d0ed5aeb9b2b84f28a77fb22b1dc5abf24d44 WHIRLPOOL 0b3f9778f8d3ca8417e7943ad49c236446de927ddcb80bd5b5fb62fc6accd63663666db716104dd6eb27552f288999a7191842b6fc0c4ccb9d810152b78f4659
-EBUILD llvm-3.6.1.ebuild 15458 SHA256 2171ecd5da2735212e4539a43211db11d5f0126cf47b4bfb38dc9d4cb4370391 SHA512 631e497f91049fab1cd9f5d835e73ef744d76f84be4485ae8950d63a0c6d5a04df9f9e518b1c566e9d3bfd9a45e1d791ac64a1d35f6d72e0c4dc2b34b496fd56 WHIRLPOOL 81b5d30b99e3b59ad0ee386e700311f72a06490227890f1816c4af733566bd7c0bbbdb671b6cd73d614ca36e5c3b3c5fc314b89d695654be6f05fe3113172660
+EBUILD llvm-3.6.1.ebuild 15577 SHA256 de3d8f200d292b83a5cff246bf03f62a83a4eee0f9e3ccafc59bd68d6694816c SHA512 120017895024f5b0e6d7c1f63b870f82c5ba1571e84fd9f3118ea0d38134b88714354e61e7f27c02171c16df28ee8275eee4682ead8a388d8d38f0c6163ff4cb WHIRLPOOL 872dbdb3948e4358dd0cd769686aab67194beb0de9d8205107be32d18fc22a19b6d8f926f6e971d1c1f342ff0c430e0298930b8a96f50e30df03811e028cb398
 EBUILD llvm-9999.ebuild 12570 SHA256 15ccc3fbfa05a19bb970cee935ec723d5e0510718cfff0b530c43a378c7de291 SHA512 b1ea1b63209c93baa57eb123844010fc18e4e32edaaf62cec8654c3627bbe53d22308e329b3d2d195b2e2e7fbc2dbc5dcdcfa49a23f7eb4a6f8695f42c6effc7 WHIRLPOOL 4e11d0598ad531ca5a2e646fc2441af137d5621471f5b137f12acbd546e37a6b25430061c0f9a232d815f3713fc61956ec8a6c66968b29328e7a13e6db15a4d9
-MISC ChangeLog 42346 SHA256 39b4b778b3891f06838a15f60e70cf446855a85e7e8407b9961f7831e8310c31 SHA512 0f69ba9fcb80d06cdcab2ccf90aa9f8a4788be9a153af252f3aff87122b086a8583ecf58efd7883d8eb56e2048bc978f0e270bcb91f17a5a8a52b0a245e20b17 WHIRLPOOL b9ee7d8f53e3b41c7e57fd50ec8dcd9989769112852e553b35f7d7c73721c7f1ee5e4f82333365ff8d02f399eb34a54418f6e210860f1f9990987eb284a2b865
+MISC ChangeLog 42592 SHA256 defc79edb6a49d7b86c26f9745d1a46fd5af6129f658e29e856390775a4c9724 SHA512 57cda8db2586799ef4803acbbe482c19386020472aac22e3d580f9accaa809fa14eec354621670d3f9eb956f3b81091e8d465da0aa1b841fb2f24d7df6e8ae2d WHIRLPOOL be973e8740c9f6d4edcefe829c8cad4a827fe2b5efced206732f39031be5aa35b9147dcfc7629c7ece1d2f09c30c848a655dd013b636f9f4d8b41c8773062c98
 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVfJfkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVfcA4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOE84QAIt1yNGNm1cbHwJainLS9wK0
-vkHxfHB4UXkzLuqgOfOHkF5C1aefInSZlPn6Fj39PnDycV7zAi9T04KfLcrLrQ7b
-3TyruX/R23Vm/G08eYX8RtjhQi9d9Y/6gGVOudbl0WH2YRAAcyO6ju4BUvm3xhoK
-+f5PiXOwfd+dOpUgKLyJqVOfE8akS5YlBVFmvlDOdOHPkwDjsvL9TOH0QH8QA2Ug
-c1nLLZZNK/UfAxEporrEd/4L47NQv9V+Gxa7wtzYQ5E3FptZBcaa77JztXLkL9B/
-c7JBqErHwE3TVxGX3NSfmN/7zsqXyvEYgnCxdtm+30EopOtFMU/w+998nGDEEDl3
-Gx5KwS0Y+ytjZz4WXwOQt/WApy72mpyJVUKb7upFp4lIFNMFBqBX2/7epD7czxHf
-CEvZSEJVt+zlBgilsussLYvXsZy9kQ/YwddlvPtNr/rcjbsHH9Un3/9wiGvxDKNd
-lh7ymn5dPMBAWz+gjlwWCRKst2p6pT/0Z3mK2l8hgakNlyTddVHF6LkdcLsmZJyc
-ovIICeKxKoZjRdZAzmN0lQe95InZ2iJGiul0F240lxE/2FG0UARodOezHuI5nM0y
-jVUsn9g8SN2RkBDCNeqKaJIk88Yes8K/tb0ZGmvSKlY8aZuchClmMRRBdOc/DW9u
-3Fjhbm3nIy/Vw6DldCjP
-=LjLl
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO9OAQAI2qAp+Vq0HMZ/9bsBMgDKAT
+2TVUq2W8i5E0jtq3hZAWJbg3NFtOPYQ7XyLJ9/2oePRNqiYrEjOvCFVeE6wxs0zq
+CP/DLu6qH/TNHOz2w6VzuAD8h7Q1jZQetYcodiBSktsJ9mMsnMkaV+EF45HWMz2z
+CafJhbCNJx13Ibg4Gi+1gxZHXdOavL0zbLlZdW8fOUxaNOV12vP9SV47TjY8TQZf
+m16BSTtoNJ2tuYojV482UEklAnwArBOd1KCxxjcxDU/zs+t2jejm+eAnau1pjtmP
+nWo/kcrRQtdDU9zZlzAiQ+w2sq35Xu6kpPaQrJHYCm70PBCk0KdmA8QBbuBT4ynz
+EJoop2DtcjyKGV36A/CBbmnc6bOIbxpq0G2ic1z6ff0NIU78t+K5cB0VKfJ8Bgm2
+6wiS3Oul0UbHuIMVj7/wMZBVVEXNFUXeI651nHZaMHuifLpqYqNs97U1Pg5R5WbF
+JbO223ZEJZW07ywPljRxHJMstcA9013nQaGWo+sYKzfOgLC2W6kSxK9+gVB01Ab+
+GNLkTvNgBfM5wq2zGKArCENWo8fKaCOAYwJYgVMRHPjq0DYpqRWjqGwiPGhA17vV
+ActF3UHoM/kWaAwOcXDQ/uB+sRjwzWEgs/Isab4ipDSI8ZbD2WjGntVjENCTl56m
+TiTtrpfxqfu9byFJS/uy
+=PdjM
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch b/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch
new file mode 100644
index 000000000000..31f5fc2b7f99
--- /dev/null
+++ b/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch
@@ -0,0 +1,25 @@
+Fix build fails with using gcc-4.9 on Gentoo/FreeBSD
+https://bugs.gentoo.org/show_bug.cgi?id=548444
+
+diff --git a/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp b/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp
+index d6bd5c3..372f76f 100644
+--- a/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp
++++ b/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp
+@@ -22,6 +22,8 @@
+ #include "llvm/Support/FileSystem.h"
+ #include "llvm/Support/Process.h"
+ 
++#include <cstdio>
++
+ // Include the necessary headers to interface with the Windows registry and
+ // environment.
+ #if defined(LLVM_ON_WIN32)
+@@ -212,7 +214,7 @@ bool MSVCToolChain::getWindowsSDKDir(std::string &path, int &major,
+       "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\$VERSION",
+       "InstallationFolder", path, &sdkVersion);
+   if (!sdkVersion.empty())
+-    ::sscanf(sdkVersion.c_str(), "v%d.%d", &major, &minor);
++    std::sscanf(sdkVersion.c_str(), "v%d.%d", &major, &minor);
+   return hasSDKDir && !path.empty();
+ }
+ 
diff --git a/sys-devel/llvm/llvm-3.6.1.ebuild b/sys-devel/llvm/llvm-3.6.1.ebuild
index 529368ebf9e6..241e0898eaa1 100644
--- a/sys-devel/llvm/llvm-3.6.1.ebuild
+++ b/sys-devel/llvm/llvm-3.6.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-devel/llvm/llvm-3.6.1.ebuild,v 1.4 2015/06/05 14:48:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.6.1.ebuild,v 1.5 2015/06/14 17:56:07 mgorny Exp $
 
 EAPI=5
 
@@ -158,6 +158,9 @@ src_prepare() {
 		epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch
 		epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
+
+		# Fix build fails with using gcc-4.9 on Gentoo/FreeBSD, bug #548444
+		epatch "${FILESDIR}"/clang-3.6-fbsd-gcc49.patch
 	fi
 
 	if use prefix && use clang; then