sys-devel/llvm: fix patches for 3.4.2

Package-Manager: portage-2.2.28
johu · Sep 10, 2016 · 2a73d6a · 2a73d6a
1 parent 052b6bb
commit 2a73d6a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/...vm/files/clang-3.4-darwin_build_fix.patch → .../files/3.4.2/clang/darwin_build_fix.patch b/...vm/files/clang-3.4-darwin_build_fix.patch → .../files/3.4.2/clang/darwin_build_fix.patch
diff --git a/...llvm/files/clang-3.4-gentoo-install.patch → ...vm/files/3.4.2/clang/gentoo-install.patch b/...llvm/files/clang-3.4-gentoo-install.patch → ...vm/files/3.4.2/clang/gentoo-install.patch
diff --git a/...3.1-gentoo-runtime-gcc-detection-v3.patch → ...ang/gentoo-runtime-gcc-detection-v3.patch b/...3.1-gentoo-runtime-gcc-detection-v3.patch → ...ang/gentoo-runtime-gcc-detection-v3.patch
diff --git a/.../llvm/files/llvm-3.4-gentoo-install.patch → ...vel/llvm/files/3.4.2/gentoo-install.patch b/.../llvm/files/llvm-3.4-gentoo-install.patch → ...vel/llvm/files/3.4.2/gentoo-install.patch
diff --git a/sys-devel/llvm/llvm-3.4.2-r100.ebuild b/sys-devel/llvm/llvm-3.4.2-r100.ebuild
@@ -84,16 +84,16 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
-	epatch "${FILESDIR}"/${PN}-3.4-gentoo-install.patch
+	epatch "${FILESDIR}"/3.6.2/nodoctargz.patch
+	epatch "${FILESDIR}"/3.4.2/gentoo-install.patch
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		epatch "${FILESDIR}"/clang-3.1-gentoo-runtime-gcc-detection-v3.patch
+		epatch "${FILESDIR}"/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch
 
-		epatch "${FILESDIR}"/clang-3.4-gentoo-install.patch
-		epatch "${FILESDIR}"/clang-3.4-darwin_build_fix.patch
-		epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+		epatch "${FILESDIR}"/3.4.2/clang/gentoo-install.patch
+		epatch "${FILESDIR}"/3.4.2/clang/darwin_build_fix.patch
+		epatch "${FILESDIR}"/3.9.0/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 	fi