commit: e5172e5d68f4674f83a3c4c8441a8288aed7c385
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 3 07:29:46 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 3 08:34:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5172e5d
sys-devel/clang: Forward-port LD_LIBRARY_PATH fix to 5.0.0
The LD_LIBRARY_PATH fix for clang-tools-extra has been missed for
backporting, so include it in the 5.0.0 release.
sys-devel/clang/clang-4.0.1.ebuild | 2 +-
sys-devel/clang/clang-5.0.9999.ebuild | 5 +++++
.../0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch | 0
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/sys-devel/clang/clang-4.0.1.ebuild
b/sys-devel/clang/clang-4.0.1.ebuild
index 1acc0234ffd..00c6e7371ae 100644
--- a/sys-devel/clang/clang-4.0.1.ebuild
+++ b/sys-devel/clang/clang-4.0.1.ebuild
@@ -102,7 +102,7 @@ src_prepare() {
cd tools/extra || die
# fix stand-alone test build for extra tools
eapply
"${FILESDIR}"/4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch
- eapply
"${FILESDIR}"/4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
+ eapply
"${FILESDIR}"/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
cd - >/dev/null || die
# User patches
diff --git a/sys-devel/clang/clang-5.0.9999.ebuild
b/sys-devel/clang/clang-5.0.9999.ebuild
index cca162d183a..958a91d25ad 100644
--- a/sys-devel/clang/clang-5.0.9999.ebuild
+++ b/sys-devel/clang/clang-5.0.9999.ebuild
@@ -105,6 +105,11 @@ src_prepare() {
# fix finding compiler-rt libs
eapply
"${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
+ cd tools/extra || die
+ # fix stand-alone test build for extra tools
+ eapply
"${FILESDIR}"/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
+ cd - >/dev/null || die
+
# User patches
eapply_user
}
diff --git
a/sys-devel/clang/files/4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
b/sys-devel/clang/files/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
similarity index 100%
rename from
sys-devel/clang/files/4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
rename to
sys-devel/clang/files/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
