[gentoo-commits] repo/user/dlang:master commit in: dev-lang/ldc2/files/, dev-lang/ldc2/

[gentoo-commits] repo/user/dlang:master commit in: dev-lang/ldc2/files/, dev-lang/ldc2/

[Marco Leise]

commit:     83e654a75792d2cefe31077c6e58b8054869293f
Author:     Marco Leise <marco.leise <AT> gmx <DOT> de>
AuthorDate: Mon Feb 10 16:07:50 2020 +0000
Commit:     Marco Leise <marco.leise <AT> gmx <DOT> de>
CommitDate: Mon Feb 10 16:07:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=83e654a7

Fix for FileCheck;not already defined in ldc2-1.18

Signed-off-by: Marco Leise <marco.leise <AT> gmx.de>

 dev-lang/ldc2/files/ldc2-1.18.0-FileCheck-not.patch  | 20 ++++++++++++++++++++
 .../files/ldc2-1.9.0-link-defaultlib-shared.patch    | 11 -----------
 dev-lang/ldc2/ldc2-1.18.0.ebuild                     |  5 +++--
 3 files changed, 23 insertions(+), 13 deletions(-)

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
new file mode 100644
index 0000000..3253da2
--- /dev/null
+++ b/dev-lang/ldc2/files/ldc2-1.18.0-FileCheck-not.patch
@@ -0,0 +1,20 @@
+--- a/utils/CMakeLists.txt	2020-02-10 16:40:25.516183683 +0100
++++ b/utils/CMakeLists.txt	2020-02-10 16:37:23.941181536 +0100
+@@ -31,7 +31,7 @@
+     target_link_libraries(gen_gccbuiltins dl)
+ endif()
+
+-if (TARGET FileCheck)
++if ((TARGET FileCheck) OR (EXISTS ${LLVM_ROOT_DIR}/bin/FileCheck))
+   # already provided by LLVM
+ else()
+ # Build FileCheck for testing (build source version depending on LLVM version)
+@@ -50,7 +50,7 @@
+ endif()
+ endif()
+
+-if (TARGET not)
++if ((TARGET not) OR (EXISTS ${LLVM_ROOT_DIR}/bin/not))
+   # already provided by LLVM
+ else()
+ # Build `not` for testing

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
deleted file mode 100644
index 6576e5c..0000000
--- a/dev-lang/ldc2/files/ldc2-1.9.0-link-defaultlib-shared.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/runtime/CMakeLists.txt
-+++ b/runtime/CMakeLists.txt
-@@ -268,7 +268,7 @@
- 
- # Only have either shared or static libs?
- # Then explicitly default to linking against them via default LDC switch.
--if(${BUILD_SHARED_LIBS} STREQUAL "ON")
-+if(NOT ${BUILD_SHARED_LIBS} STREQUAL "OFF")
-     set(ADDITIONAL_DEFAULT_LDC_SWITCHES "\n        \"-link-defaultlib-shared\",")
- elseif(${BUILD_SHARED_LIBS} STREQUAL "OFF")
-     set(ADDITIONAL_DEFAULT_LDC_SWITCHES "\n        \"-link-defaultlib-shared=false\",")

diff --git a/dev-lang/ldc2/ldc2-1.18.0.ebuild b/dev-lang/ldc2/ldc2-1.18.0.ebuild
index eabd185..e3fbd03 100644
--- a/dev-lang/ldc2/ldc2-1.18.0.ebuild
+++ b/dev-lang/ldc2/ldc2-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,8 @@ DEPEND=">=dev-util/cmake-3.8
 	${RDEPEND}"
 LLVM_MAX_SLOT=9
 PATCHES="${FILESDIR}/ldc2-1.12.0-link-defaultlib-shared.patch
-	${FILESDIR}/ldc2-1.13.0-llvm-7.1.0-compatibility.patch"
+	${FILESDIR}/ldc2-1.13.0-llvm-7.1.0-compatibility.patch
+	${FILESDIR}/ldc2-1.18.0-FileCheck-not.patch"
 
 # For now, we support amd64 multilib. Anyone is free to add more support here.
 MULTILIB_COMPAT=( abi_x86_{32,64} )