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.

diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild
index 1acc0234ffdea3e33724a053b0316b8fa7c0a67d..00c6e7371aec4334c41af06a9d50cee8399fa58d 100644 (file)
--- 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 cca162d183ae33f1f4f7d6c033beef514906762f..958a91d25adc4e646aec120710a3ea97fec767c3 100644 (file)
--- 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