From e5172e5d68f4674f83a3c4c8441a8288aed7c385 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 3 Sep 2017 09:29:46 +0200 Subject: [PATCH] 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 +++++ ...est-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch | 0 3 files changed, 6 insertions(+), 1 deletion(-) rename sys-devel/clang/files/{4.0.1 => 5.0.0}/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch (100%) diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild index 1acc0234ffde..00c6e7371aec 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 cca162d183ae..958a91d25adc 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 -- 2.26.2