sci-mathematics/clingo: system catch

Closes: https://bugs.gentoo.org/843479
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
This commit is contained in:
Alessandro Barbieri 2022-05-12 14:52:55 +02:00
parent 54b1cba8d1
commit c66eb0d444
No known key found for this signature in database
GPG Key ID: 4E4140121372C837
2 changed files with 32 additions and 3 deletions

View File

@ -18,7 +18,6 @@ SRC_URI="https://github.com/potassco/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="examples lua python test +tools"
RDEPEND="
@ -37,7 +36,7 @@ BDEPEND="
virtual/pkgconfig
"
#PATCHES=( "${FILESDIR}/${P}-system-clasp.patch" )
PATCHES=( "${FILESDIR}/${P}-system-catch.patch" )
RESTRICT="!test? ( test )"
REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
@ -75,7 +74,7 @@ src_configure() {
-DCLINGO_USE_LOCAL_CLASP=OFF
)
if use lua; then
mycmakeargs+=( "DCLINGO_LUA_VERSION:LIST=$(lua_get_version);EXACT" )
mycmakeargs+=( "-DCLINGO_LUA_VERSION:LIST=$(lua_get_version);EXACT" )
mycmakeargs+=( "-DLUACLINGO_INSTALL_DIR=$(lua_get_cmod_dir)" )
fi
if use python; then

View File

@ -0,0 +1,30 @@
--- a/libclingo/tests/CMakeLists.txt
+++ b/libclingo/tests/CMakeLists.txt
@@ -2,7 +2,6 @@
set(ide_source_group "Source Files")
set(source-group
"${CMAKE_CURRENT_SOURCE_DIR}/astv2.cc"
- "${CMAKE_CURRENT_SOURCE_DIR}/catch.hpp"
"${CMAKE_CURRENT_SOURCE_DIR}/clingo.cc"
"${CMAKE_CURRENT_SOURCE_DIR}/main.cc"
"${CMAKE_CURRENT_SOURCE_DIR}/propagator.cc"
--- a/libgringo/tests/CMakeLists.txt
+++ b/libgringo/tests/CMakeLists.txt
@@ -1,7 +1,6 @@
# [[[source: .
set(ide_source_group "Source Files")
set(source-group
- "${CMAKE_CURRENT_SOURCE_DIR}/catch.hpp"
"${CMAKE_CURRENT_SOURCE_DIR}/graph.cc"
"${CMAKE_CURRENT_SOURCE_DIR}/intervals.cc"
"${CMAKE_CURRENT_SOURCE_DIR}/main.cc"
--- a/libreify/tests/CMakeLists.txt
+++ b/libreify/tests/CMakeLists.txt
@@ -1,7 +1,6 @@
# [[[source: .
set(ide_source_group "Source Files")
set(source-group
- "${CMAKE_CURRENT_SOURCE_DIR}/catch.hpp"
"${CMAKE_CURRENT_SOURCE_DIR}/main.cc"
"${CMAKE_CURRENT_SOURCE_DIR}/program.cc")
source_group("${ide_source_group}" FILES ${source-group})