| 1 |
commit: 83e654a75792d2cefe31077c6e58b8054869293f |
| 2 |
Author: Marco Leise <marco.leise <AT> gmx <DOT> de> |
| 3 |
AuthorDate: Mon Feb 10 16:07:50 2020 +0000 |
| 4 |
Commit: Marco Leise <marco.leise <AT> gmx <DOT> de> |
| 5 |
CommitDate: Mon Feb 10 16:07:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=83e654a7 |
| 7 |
|
| 8 |
Fix for FileCheck;not already defined in ldc2-1.18 |
| 9 |
|
| 10 |
Signed-off-by: Marco Leise <marco.leise <AT> gmx.de> |
| 11 |
|
| 12 |
dev-lang/ldc2/files/ldc2-1.18.0-FileCheck-not.patch | 20 ++++++++++++++++++++ |
| 13 |
.../files/ldc2-1.9.0-link-defaultlib-shared.patch | 11 ----------- |
| 14 |
dev-lang/ldc2/ldc2-1.18.0.ebuild | 5 +++-- |
| 15 |
3 files changed, 23 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/ldc2/files/ldc2-1.18.0-FileCheck-not.patch b/dev-lang/ldc2/files/ldc2-1.18.0-FileCheck-not.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..3253da2 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-lang/ldc2/files/ldc2-1.18.0-FileCheck-not.patch |
| 22 |
@@ -0,0 +1,20 @@ |
| 23 |
+--- a/utils/CMakeLists.txt 2020-02-10 16:40:25.516183683 +0100 |
| 24 |
++++ b/utils/CMakeLists.txt 2020-02-10 16:37:23.941181536 +0100 |
| 25 |
+@@ -31,7 +31,7 @@ |
| 26 |
+ target_link_libraries(gen_gccbuiltins dl) |
| 27 |
+ endif() |
| 28 |
+ |
| 29 |
+-if (TARGET FileCheck) |
| 30 |
++if ((TARGET FileCheck) OR (EXISTS ${LLVM_ROOT_DIR}/bin/FileCheck)) |
| 31 |
+ # already provided by LLVM |
| 32 |
+ else() |
| 33 |
+ # Build FileCheck for testing (build source version depending on LLVM version) |
| 34 |
+@@ -50,7 +50,7 @@ |
| 35 |
+ endif() |
| 36 |
+ endif() |
| 37 |
+ |
| 38 |
+-if (TARGET not) |
| 39 |
++if ((TARGET not) OR (EXISTS ${LLVM_ROOT_DIR}/bin/not)) |
| 40 |
+ # already provided by LLVM |
| 41 |
+ else() |
| 42 |
+ # Build `not` for testing |
| 43 |
|
| 44 |
diff --git a/dev-lang/ldc2/files/ldc2-1.9.0-link-defaultlib-shared.patch b/dev-lang/ldc2/files/ldc2-1.9.0-link-defaultlib-shared.patch |
| 45 |
deleted file mode 100644 |
| 46 |
index 6576e5c..0000000 |
| 47 |
--- a/dev-lang/ldc2/files/ldc2-1.9.0-link-defaultlib-shared.patch |
| 48 |
+++ /dev/null |
| 49 |
@@ -1,11 +0,0 @@ |
| 50 |
---- a/runtime/CMakeLists.txt |
| 51 |
-+++ b/runtime/CMakeLists.txt |
| 52 |
-@@ -268,7 +268,7 @@ |
| 53 |
- |
| 54 |
- # Only have either shared or static libs? |
| 55 |
- # Then explicitly default to linking against them via default LDC switch. |
| 56 |
--if(${BUILD_SHARED_LIBS} STREQUAL "ON") |
| 57 |
-+if(NOT ${BUILD_SHARED_LIBS} STREQUAL "OFF") |
| 58 |
- set(ADDITIONAL_DEFAULT_LDC_SWITCHES "\n \"-link-defaultlib-shared\",") |
| 59 |
- elseif(${BUILD_SHARED_LIBS} STREQUAL "OFF") |
| 60 |
- set(ADDITIONAL_DEFAULT_LDC_SWITCHES "\n \"-link-defaultlib-shared=false\",") |
| 61 |
|
| 62 |
diff --git a/dev-lang/ldc2/ldc2-1.18.0.ebuild b/dev-lang/ldc2/ldc2-1.18.0.ebuild |
| 63 |
index eabd185..e3fbd03 100644 |
| 64 |
--- a/dev-lang/ldc2/ldc2-1.18.0.ebuild |
| 65 |
+++ b/dev-lang/ldc2/ldc2-1.18.0.ebuild |
| 66 |
@@ -1,4 +1,4 @@ |
| 67 |
-# Copyright 1999-2019 Gentoo Authors |
| 68 |
+# Copyright 1999-2020 Gentoo Authors |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
EAPI=7 |
| 72 |
@@ -31,7 +31,8 @@ DEPEND=">=dev-util/cmake-3.8 |
| 73 |
${RDEPEND}" |
| 74 |
LLVM_MAX_SLOT=9 |
| 75 |
PATCHES="${FILESDIR}/ldc2-1.12.0-link-defaultlib-shared.patch |
| 76 |
- ${FILESDIR}/ldc2-1.13.0-llvm-7.1.0-compatibility.patch" |
| 77 |
+ ${FILESDIR}/ldc2-1.13.0-llvm-7.1.0-compatibility.patch |
| 78 |
+ ${FILESDIR}/ldc2-1.18.0-FileCheck-not.patch" |
| 79 |
|
| 80 |
# For now, we support amd64 multilib. Anyone is free to add more support here. |
| 81 |
MULTILIB_COMPAT=( abi_x86_{32,64} ) |
Archives