| 1 |
commit: e5172e5d68f4674f83a3c4c8441a8288aed7c385 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 3 07:29:46 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 3 08:34:17 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5172e5d |
| 7 |
|
| 8 |
sys-devel/clang: Forward-port LD_LIBRARY_PATH fix to 5.0.0 |
| 9 |
|
| 10 |
The LD_LIBRARY_PATH fix for clang-tools-extra has been missed for |
| 11 |
backporting, so include it in the 5.0.0 release. |
| 12 |
|
| 13 |
sys-devel/clang/clang-4.0.1.ebuild | 2 +- |
| 14 |
sys-devel/clang/clang-5.0.9999.ebuild | 5 +++++ |
| 15 |
.../0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch | 0 |
| 16 |
3 files changed, 6 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild |
| 19 |
index 1acc0234ffd..00c6e7371ae 100644 |
| 20 |
--- a/sys-devel/clang/clang-4.0.1.ebuild |
| 21 |
+++ b/sys-devel/clang/clang-4.0.1.ebuild |
| 22 |
@@ -102,7 +102,7 @@ src_prepare() { |
| 23 |
cd tools/extra || die |
| 24 |
# fix stand-alone test build for extra tools |
| 25 |
eapply "${FILESDIR}"/4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch |
| 26 |
- eapply "${FILESDIR}"/4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch |
| 27 |
+ eapply "${FILESDIR}"/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch |
| 28 |
cd - >/dev/null || die |
| 29 |
|
| 30 |
# User patches |
| 31 |
|
| 32 |
diff --git a/sys-devel/clang/clang-5.0.9999.ebuild b/sys-devel/clang/clang-5.0.9999.ebuild |
| 33 |
index cca162d183a..958a91d25ad 100644 |
| 34 |
--- a/sys-devel/clang/clang-5.0.9999.ebuild |
| 35 |
+++ b/sys-devel/clang/clang-5.0.9999.ebuild |
| 36 |
@@ -105,6 +105,11 @@ src_prepare() { |
| 37 |
# fix finding compiler-rt libs |
| 38 |
eapply "${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch |
| 39 |
|
| 40 |
+ cd tools/extra || die |
| 41 |
+ # fix stand-alone test build for extra tools |
| 42 |
+ eapply "${FILESDIR}"/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch |
| 43 |
+ cd - >/dev/null || die |
| 44 |
+ |
| 45 |
# User patches |
| 46 |
eapply_user |
| 47 |
} |
| 48 |
|
| 49 |
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 |
| 50 |
similarity index 100% |
| 51 |
rename from sys-devel/clang/files/4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch |
| 52 |
rename to sys-devel/clang/files/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch |
Archives