diff options
author | Alessandro Barbieri <lssndrbarbieri@gmail.com> | 2022-05-12 14:52:55 +0200 |
---|---|---|
committer | Alessandro Barbieri <lssndrbarbieri@gmail.com> | 2022-05-24 19:36:35 +0200 |
commit | c66eb0d444273f8f2df4fbb3d6dc905b9ecb2dc6 (patch) | |
tree | ac0f49425a69552436750adeaa02e4d5afe1afb5 /sci-mathematics | |
parent | octaveforge.eclass: replace eapply_user with default (diff) | |
download | guru-c66eb0d444273f8f2df4fbb3d6dc905b9ecb2dc6.tar.gz guru-c66eb0d444273f8f2df4fbb3d6dc905b9ecb2dc6.tar.bz2 guru-c66eb0d444273f8f2df4fbb3d6dc905b9ecb2dc6.zip |
sci-mathematics/clingo: system catch
Closes: https://bugs.gentoo.org/843479
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Diffstat (limited to 'sci-mathematics')
-rw-r--r-- | sci-mathematics/clingo/clingo-5.5.2.ebuild | 5 | ||||
-rw-r--r-- | sci-mathematics/clingo/files/clingo-5.5.2-system-catch.patch | 30 |
2 files changed, 32 insertions, 3 deletions
diff --git a/sci-mathematics/clingo/clingo-5.5.2.ebuild b/sci-mathematics/clingo/clingo-5.5.2.ebuild index b61a48318..55957c759 100644 --- a/sci-mathematics/clingo/clingo-5.5.2.ebuild +++ b/sci-mathematics/clingo/clingo-5.5.2.ebuild @@ -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 diff --git a/sci-mathematics/clingo/files/clingo-5.5.2-system-catch.patch b/sci-mathematics/clingo/files/clingo-5.5.2-system-catch.patch new file mode 100644 index 000000000..938d17503 --- /dev/null +++ b/sci-mathematics/clingo/files/clingo-5.5.2-system-catch.patch @@ -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}) |