summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2020-10-12 14:28:06 +0200
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2020-10-16 20:14:34 +0000
commit95c0d5b3394cc3b32b6d6c8a4754a878801fbd6b (patch)
treef79d528723c159f80bd0cba96e83c39dcaad3048
parent6b2ac1e98b6e3a82826f2ba8ccda5950ad6d64d5 (diff)
downloadarbor-95c0d5b3394cc3b32b6d6c8a4754a878801fbd6b.tar.gz
arbor-95c0d5b3394cc3b32b6d6c8a4754a878801fbd6b.tar.xz
clang: drop 8
Signed-off-by: Marc-Antoine Perennou <keruspe@exherbo.org>
-rw-r--r--packages/dev-lang/clang/clang-8.0.1-r3.exheres-015
-rw-r--r--packages/dev-lang/clang/clang.exlib18
-rw-r--r--packages/dev-lang/clang/files/8/clang-8-Driver-Set-correct-include-path-for-Exherbo.patch28
3 files changed, 3 insertions, 58 deletions
diff --git a/packages/dev-lang/clang/clang-8.0.1-r3.exheres-0 b/packages/dev-lang/clang/clang-8.0.1-r3.exheres-0
deleted file mode 100644
index c2134b1ff..000000000
--- a/packages/dev-lang/clang/clang-8.0.1-r3.exheres-0
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2012 Elias Pipping <pipping@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require clang
-
-PLATFORMS="~amd64 ~armv7 ~x86"
-
-src_prepare() {
- clang_src_prepare
-
- # ld tests will fail because of Exherbo's non-standard path for ld
- edo sed -e '/-dynamic-linker/d' \
- -i "${CMAKE_SOURCE}"/test/Driver/riscv32-toolchain.c
-}
-
diff --git a/packages/dev-lang/clang/clang.exlib b/packages/dev-lang/clang/clang.exlib
index 6e4a4ca08..dbf824cdd 100644
--- a/packages/dev-lang/clang/clang.exlib
+++ b/packages/dev-lang/clang/clang.exlib
@@ -84,16 +84,12 @@ elif ever at_least 10; then
-p2 "${FILES}"/10/D74602.diff
-p2 "${FILES}"/10/D74757.diff
)
-elif ever at_least 9; then
+else
DEFAULT_SRC_PREPARE_PATCHES+=(
-p2 "${FILES}"/9/0001-clang-Exherbo-multiarch-ajustments.patch
-p2 "${FILES}"/9/5e866e411caad4c4e17e7e0c67b06d28451e1bf2.patch
-p2 "${FILES}"/9/bb282f47511e83fdb6761a6bda185e2062d7a099.patch
)
-else
- DEFAULT_SRC_PREPARE_PATCHES+=(
- -p2 "${FILES}"/8/clang-8-Driver-Set-correct-include-path-for-Exherbo.patch
- )
fi
CMAKE_SRC_CONFIGURE_PARAMS+=(
@@ -146,11 +142,6 @@ clang_src_unpack() {
clang_src_prepare() {
edo pushd "${CMAKE_SOURCE}"
- if ! ever at_least 9; then
- # ld tests will fail because of Exherbo's non-standard path for ld
- edo rm test/Driver/{dyld-prefix.c,linux-ld.c,mips-cs.cpp}
- fi
-
# Fails because we explicitely specify the default cxx stdlib
edo rm test/Driver/{baremetal.cpp,fuzzer.c}
@@ -158,11 +149,8 @@ clang_src_prepare() {
edo rm test/Driver/wasm-toolchain.c{,pp}
edo rm test/Headers/{arm-fp16-header.c,arm-neon-header.c}
- if ever at_least 9 ; then
- # Fails because we explicitely specify the default unwindlib
- # Only present in >= 9
- edo rm test/Driver/compiler-rt-unwind.c
- fi
+ # Fails because we explicitely specify the default unwindlib
+ edo rm test/Driver/compiler-rt-unwind.c
# The build system doesn't pick up that LLVM has zlib support when doing a standalone build
edo rm test/Driver/nozlibcompress.c
diff --git a/packages/dev-lang/clang/files/8/clang-8-Driver-Set-correct-include-path-for-Exherbo.patch b/packages/dev-lang/clang/files/8/clang-8-Driver-Set-correct-include-path-for-Exherbo.patch
deleted file mode 100644
index c108ecacf..000000000
--- a/packages/dev-lang/clang/files/8/clang-8-Driver-Set-correct-include-path-for-Exherbo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f5eff246e81374b01abe0af09fc3a46f75273a4b Mon Sep 17 00:00:00 2001
-From: Marvin Schmidt <marv@exherbo.org>
-Date: Sun, 25 Aug 2019 21:15:08 +0200
-Subject: [PATCH] [Driver] Set correct include path for Exherbo
-
----
- clang/lib/Driver/ToolChains/Linux.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
-index dfdfb18319a..431677fd9f8 100644
---- a/clang/lib/Driver/ToolChains/Linux.cpp
-+++ b/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -852,6 +852,11 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
- }
- }
-
-+ // Exherbo multiarch support
-+ const std::string IncludeDir = "/usr/" + getTriple().str() + "/include";
-+ if (D.getVFS().exists(IncludeDir))
-+ addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + IncludeDir);
-+
- if (getTriple().getOS() == llvm::Triple::RTEMS)
- return;
-
---
-2.23.0
-