diff options
Diffstat (limited to 'sys-devel/clang')
| -rw-r--r-- | sys-devel/clang/Manifest | 3 | ||||
| -rw-r--r-- | sys-devel/clang/clang-5.0.1.ebuild | 13 | ||||
| -rw-r--r-- | sys-devel/clang/files/5.0.0/darwin_prefix-include-paths.patch | 18 |
3 files changed, 30 insertions, 4 deletions
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest index 7157568c704b..8f1c459b0e04 100644 --- a/sys-devel/clang/Manifest +++ b/sys-devel/clang/Manifest @@ -2,6 +2,7 @@ AUX 4.0.1/0001-Frontend-Correct-values-of-ATOMIC_-_LOCK_FREE-to-mat.patch 4083 B AUX 4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch 2214 BLAKE2B 6c1860f2ba0586d8b8b9b3d055f57ccda1037e100789a2a9e5bfb84a2b21e6ec088ef43314790b773c8d56ba5716944a0e7e34f0972992bdf5a3ec9573b77c71 SHA512 211203f373a882672a712b742b1e4562103fda0a0ac86d602576c105a07af335006da325817ec0ee1f21158a67d0246c7c7ea1d6b3d78abae543f8e69814f885 AUX 4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch 1527 BLAKE2B 12692e8eb21a341ceb206f94e24a2585b7080adc2b7dcd6098f78654010dcebdaaccb180ee63b38ed49d2d3b5da34d3fb8e1147eb3515278c9d50ace4c982f96 SHA512 10e3f8a2b5fb1c16f38347f77bba3b171d9f6044c1f96c73368c9df2448cbad0c4a0147f1e1ec10b127ef5eb5a3187c4b56030ac4444269aad97e5ec3dac5f2b AUX 5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch 6888 BLAKE2B e6d9907b05f99fb21008e7533f348348a3fe81249e6bcd0c473b82ba2dbb3651f7c27ba8c84053eb9c5832de1df4de7632971fc48d47aa9fff673f76e5688263 SHA512 6d1f35f39c15b11ce631477eefcca7ade90cb08e5992839273f97c339ef6bf0deecf9625fdacbad6e8cc61e4fd213e0e1c582c407ac051d99545962e310344fe +AUX 5.0.0/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be08ea3babcae6dc1353171fad7f297f787d476d28768c7c1bbe6efc7404ea638f1dc6b4b36e1c17e141faf82be623bbd96d5e09118 SHA512 5f8ecabaf43853964bffeb3953b205bea7e8928fd53637d01842723ac8344e19cc639f6f06c199f2be88b73e60b6eab1987bc5ee7dfeaea5e710eacab90f3533 AUX 5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch 3411 BLAKE2B a47f686dffa3e710435291670b8be7b99ea89d86092230f9acce328d24efa7ee43a5023b8deb482a497c1b54eec02c89291e4f10ad2c60382cc4ebe7c913981e SHA512 1ebfe7a6d06dd2991923cd1142c5c5b09ba2d06a3c7e0cbcb5b0f1d34aee57bf585941c0dd44ab331e9427828e5c63ea7475d673ccd3ec8617b99c59c56229a0 DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964 DIST cfe-5.0.0.src.tar.xz 11437024 BLAKE2B c848d9771951be4d5fb14d5ca3a0ad788675c0833bd4f2e2069475d64e6108297bb2dbae5129b516d35b6a8c51c020afec430fcf32058970455060e50442a73f SHA512 14acdd622310122b544c952ee5b932b7006d9d8424319f0e3974f2503d40a0cec4200fdd3d813a32ce0d877bcfbb9a5bd5c36f6142b4330e6c814f113ca2efe8 @@ -22,6 +23,6 @@ EBUILD clang-3.7.1-r100.ebuild 1121 BLAKE2B 9cf6e15e5a2fa9d400731747105f65c8ef14 EBUILD clang-3.9.1-r100.ebuild 1534 BLAKE2B b269b09553ec5559ad90ffdfcaa20604c10fbe394651b7a9e037a9aaac878a6ef6cc2702a1cc6123cffa0ece705b851e908ac275f7fa854d099ec2ab8bafc9ed SHA512 84a3c016f9db31c6cbcee7620330b76af97702be3e92bd0db6e58883ccc054a792003a374cb5bf9d69b8f7c89165a2853ba495d58cd02d98524cf8025e99bcf0 EBUILD clang-4.0.1.ebuild 9440 BLAKE2B 9ccc82a8f57e8c2e7a7ad1b55b0b6e8f88ad4da2b4d71bbdfaf5312e95d35abf08b31ee38114c7f31c435881ba06d5793bcff287c6dcd11e52e78e9ac90f1d9a SHA512 3b1ead95ef28a4f126e3111297c5c8682b34d74caf369db0d52ce92b334a5025f7894103b1bd4aa820e90368c3a8796139e663da8dc6e4c01683b6f4a84f9bd1 EBUILD clang-5.0.0.ebuild 9394 BLAKE2B 70854a48bede330b76467f83d3adf52d05ffb629982ecdb38cff9585d9df9d4378f907191dc672ab62be669e77c203702c7a97e67a9082e41d55a021b60c4029 SHA512 99f117c00837dbf364e3070b4c51bccbfa3646f07a51c89494a79162b36901de3119a332af757cd1c1e15f37b9f64fe19e9d274a8ecacf5fcc8816d0c9e1a88b -EBUILD clang-5.0.1.ebuild 9447 BLAKE2B aee4c4ea80e46e1972e343360fb348b83fb04b5d29a822e0d933465975320be915e84640d55e8af77a4f9acf600302d0d00ac10b30b7830cf1c6d6c29b91bf22 SHA512 4b03eaa47f4f56a47c7786044eb1ec86ff4b2590207b28f0b7900c92ee2c78f38216dd31a0d7393341c1496181003ecfb3a6b2cfe6ed6f757788ac2330d652d5 +EBUILD clang-5.0.1.ebuild 9655 BLAKE2B 3aee99d71253a1c5f65c7fe56d6e7346d1cf944676e683bcc9dfe58a4a08db1e89180b6c421d2f95ca6dc01968734203b059d13d3c76350bfdcf4c1418d12c83 SHA512 8e313805e3ff32d6606b1cb75f9b2b8ae3c0cb0e720168c292cd9dbf694964eddda31b9e657ac0acd977852b2ba3734ccb0f406e559dfddd7ba26ecb2aef96b9 EBUILD clang-9999.ebuild 8854 BLAKE2B 1f9a2120a08a299ff32282ac034b840b7c2bf12957d3418cd59304ac9d0b911dcad6fdfda1ea3f5c21f3b274793667c1cd6c0cdb797b9647f4e251cd1f1e0db2 SHA512 558f8fbe97e6b29b6db18e36799561fea600cbbb89a95423eba92d527a6028fe727408a51d24b4711e5a9154b9547703d0e341e058640a431b1806e9ebb2e9f4 MISC metadata.xml 1455 BLAKE2B 9dd88bba7158dfdc83bfc48fa4134e1f5a3357ab778cad400a51e348bbb4b44d2740ec417fdc888df0b4fd820441649e92b7adffdd4db558a2f4c3f4830a83a1 SHA512 369a87bd551e483e81ff56f5167177b1bcfedf9bc97f501ef2b07bfdfea3a25532f5e86af062568b3b22a53fe07318fd93dc55bd83b453dd10a0f4d3e88cb932 diff --git a/sys-devel/clang/clang-5.0.1.ebuild b/sys-devel/clang/clang-5.0.1.ebuild index 9aeef0ecf6d4..d348af818eec 100644 --- a/sys-devel/clang/clang-5.0.1.ebuild +++ b/sys-devel/clang/clang-5.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ CMAKE_MIN_VERSION=3.7.0-r1 PYTHON_COMPAT=( python2_7 ) inherit cmake-utils eapi7-ver flag-o-matic llvm \ - multilib-minimal pax-utils python-single-r1 toolchain-funcs + multilib-minimal pax-utils prefix python-single-r1 toolchain-funcs MY_P=cfe-${PV/_/}.src EXTRA_P=clang-tools-extra-${PV/_/}.src @@ -30,7 +30,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} LICENSE="UoI-NCSA" SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86 ~ppc-macos ~x64-macos ~x86-macos" IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" @@ -68,6 +68,8 @@ CMAKE_BUILD_TYPE=RelWithDebInfo PATCHES=( # fix finding compiler-rt libs "${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch + # add Prefix include paths for Darwin + "${FILESDIR}"/5.0.0/darwin_prefix-include-paths.patch ) # Multilib notes: @@ -110,6 +112,11 @@ src_unpack() { fi } +src_prepare() { + default + eprefixify lib/Frontend/InitHeaderSearch.cpp +} + multilib_src_configure() { local llvm_version=$(llvm-config --version) || die local clang_version=$(ver_cut 1-3 "${llvm_version}") diff --git a/sys-devel/clang/files/5.0.0/darwin_prefix-include-paths.patch b/sys-devel/clang/files/5.0.0/darwin_prefix-include-paths.patch new file mode 100644 index 000000000000..7744b942d0e5 --- /dev/null +++ b/sys-devel/clang/files/5.0.0/darwin_prefix-include-paths.patch @@ -0,0 +1,18 @@ +--- a/lib/Frontend/InitHeaderSearch.cpp ++++ b/lib/Frontend/InitHeaderSearch.cpp +@@ -233,6 +233,7 @@ + case llvm::Triple::Bitrig: + break; + default: ++ AddPath("@GENTOO_PORTAGE_EPREFIX@/usr/include", System, false); + // FIXME: temporary hack: hard-coded paths. + AddPath("/usr/local/include", System, false); + break; +@@ -505,6 +506,7 @@ + // Add the default framework include paths on Darwin. + if (HSOpts.UseStandardSystemIncludes) { + if (triple.isOSDarwin()) { ++ AddPath("@GENTOO_PORTAGE_EPREFIX@/Frameworks", System, true); + AddPath("/System/Library/Frameworks", System, true); + AddPath("/Library/Frameworks", System, true); + } |