commit: d91e28589fa227e35e143db5d622b9120f796db3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 22 07:19:05 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 22 08:22:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d91e2858
sys-devel/clang: Reshuffle patches
sys-devel/clang/clang-4.0.1.ebuild | 2 +-
sys-devel/clang/clang-5.0.2.ebuild | 8 ++++----
sys-devel/clang/clang-6.0.1.ebuild | 2 +-
...001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch | 0
.../0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch | 0
...001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch | 0
.../files/{5.0.1 => 6.0.1}/darwin_prefix-include-paths.patch | 0
7 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-devel/clang/clang-4.0.1.ebuild
b/sys-devel/clang/clang-4.0.1.ebuild
index 672f7fc6097..469a613db91 100644
--- a/sys-devel/clang/clang-4.0.1.ebuild
+++ b/sys-devel/clang/clang-4.0.1.ebuild
@@ -89,7 +89,7 @@ src_unpack() {
src_prepare() {
# fix finding compiler-rt libs
- eapply
"${FILESDIR}"/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
+ eapply
"${FILESDIR}"/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
# fix stand-alone doc build
eapply
"${FILESDIR}"/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch
diff --git a/sys-devel/clang/clang-5.0.2.ebuild
b/sys-devel/clang/clang-5.0.2.ebuild
index 85f7d6b4404..6e07de89a3b 100644
--- a/sys-devel/clang/clang-5.0.2.ebuild
+++ b/sys-devel/clang/clang-5.0.2.ebuild
@@ -107,15 +107,15 @@ src_unpack() {
src_prepare() {
# fix finding compiler-rt libs
- eapply
"${FILESDIR}"/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
+ eapply
"${FILESDIR}"/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
# fix setting LD_LIBRARY_PATH for tests on *BSD
- eapply
"${FILESDIR}"/5.0.1/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch
+ eapply
"${FILESDIR}"/5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch
# add Prefix include paths for Darwin
- eapply "${FILESDIR}"/5.0.1/darwin_prefix-include-paths.patch
+ eapply "${FILESDIR}"/6.0.1/darwin_prefix-include-paths.patch
cd tools/extra || die
# fix setting LD_LIBRARY_PATH for tests on *BSD (extra part)
- eapply
"${FILESDIR}"/5.0.1/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch
+ eapply
"${FILESDIR}"/5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch
cd ../.. || die
cmake-utils_src_prepare
diff --git a/sys-devel/clang/clang-6.0.1.ebuild
b/sys-devel/clang/clang-6.0.1.ebuild
index d42ae48d2ea..6cd2169e898 100644
--- a/sys-devel/clang/clang-6.0.1.ebuild
+++ b/sys-devel/clang/clang-6.0.1.ebuild
@@ -70,7 +70,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo
PATCHES=(
# add Prefix include paths for Darwin
- "${FILESDIR}"/5.0.1/darwin_prefix-include-paths.patch
+ "${FILESDIR}"/6.0.1/darwin_prefix-include-paths.patch
# fix test failure with default-compiler-rt
# https://bugs.gentoo.org/650316
diff --git
a/sys-devel/clang/files/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
b/sys-devel/clang/files/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
similarity index 100%
rename from
sys-devel/clang/files/5.0.1/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
rename to
sys-devel/clang/files/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
diff --git
a/sys-devel/clang/files/5.0.1/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch
b/sys-devel/clang/files/5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch
similarity index 100%
rename from
sys-devel/clang/files/5.0.1/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch
rename to
sys-devel/clang/files/5.0.2/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch
diff --git
a/sys-devel/clang/files/5.0.1/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch
b/sys-devel/clang/files/5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch
similarity index 100%
rename from
sys-devel/clang/files/5.0.1/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch
rename to
sys-devel/clang/files/5.0.2/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch
diff --git a/sys-devel/clang/files/5.0.1/darwin_prefix-include-paths.patch
b/sys-devel/clang/files/6.0.1/darwin_prefix-include-paths.patch
similarity index 100%
rename from sys-devel/clang/files/5.0.1/darwin_prefix-include-paths.patch
rename to sys-devel/clang/files/6.0.1/darwin_prefix-include-paths.patch
