sci-mathematics/clingo: add 5.5.2, drop 5.5.1-r1

Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
This commit is contained in:
Alessandro Barbieri
2022-05-06 02:35:57 +02:00
parent 26626b7283
commit 512fbbae89
3 changed files with 3 additions and 48 deletions

View File

@@ -1 +1 @@
DIST clingo-5.5.1.tar.gz 3031728 BLAKE2B 5d938f5974184b4dff63a8b6ae746059c8a3682c2b7ca3dfbecc020462a656608de3845b83fc1c55fe74be33d7641d4d3bc961026679c7a6b264481bbad81c89 SHA512 b142a869d25a188d9ecf4c62940bc73328dacd249dbcdf611c0b6fd7a15b6bb15357cef3ce9b52b863c51f2a79efd65ae405957fc6074023b0c48807d27c0e03
DIST clingo-5.5.2.tar.gz 3136393 BLAKE2B 74f911a544d6b2756080ff813dee3d2c02517374854b7e7deafaf73fea236a79ce45a55f3270ec6fd41194c4cee1d76dfbad9617130dcf8109c7623edf8fe9ff SHA512 ec72d33c6f328ee287dc2923fbfab270e05b2da964fa9f89e811e729e7ebaf6ee191decbe743184c42926412e1990f6b8d41adc142a2e2896e0176cda06aa1c9

View File

@@ -37,7 +37,7 @@ BDEPEND="
virtual/pkgconfig
"
PATCHES=( "${FILESDIR}/${P}-system-clasp.patch" )
#PATCHES=( "${FILESDIR}/${P}-system-clasp.patch" )
RESTRICT="!test? ( test )"
REQUIRED_USE="
lua? ( ${LUA_REQUIRED_USE} )
@@ -72,6 +72,7 @@ src_configure() {
-DCLINGO_CMAKE_RANLIB="$(tc-getRANLIB)"
-DCLINGO_INSTALL_LIB=ON
-DCLINGO_USE_LIB=OFF
-DCLINGO_USE_LOCAL_CLASP=OFF
)
if use lua; then
mycmakeargs+=( "DCLINGO_LUA_VERSION:LIST=$(lua_get_version);EXACT" )

View File

@@ -1,46 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,8 +232,10 @@
enable_testing()
+find_package(Potassco REQUIRED)
+find_package(Clasp REQUIRED)
+
# NOTE: assumes that submodule has been initialized
-set(CLASP_BUILD_APP ${CLINGO_BUILD_APPS} CACHE BOOL "")
if (CLINGO_USE_LIB)
set(clingo_library_targets)
add_library(libclingo INTERFACE IMPORTED)
@@ -241,11 +243,6 @@
set_property(TARGET libclingo PROPERTY INTERFACE_LINK_LIBRARIES "clingo")
else()
set(clingo_library_targets libgringo libpotassco libclasp libreify)
- set(CLASP_USE_LOCAL_LIB_POTASSCO ON CACHE BOOL "" FORCE)
- if (NOT CLINGO_BUILD_SHARED AND CLINGO_INSTALL_LIB)
- set(CLASP_INSTALL_LIB ${CLINGO_INSTALL_LIB} CACHE BOOL "" FORCE)
- endif()
- add_subdirectory(clasp)
add_subdirectory(libreify)
add_subdirectory(libgringo)
add_subdirectory(libclingo)
--- a/libclingo/CMakeLists.txt
+++ b/libclingo/CMakeLists.txt
@@ -37,8 +37,6 @@
${source-group})
# ]]]
-list(APPEND header "${CLASP_SOURCE_DIR}/app/clasp_app.h")
-list(APPEND source "${CLASP_SOURCE_DIR}/app/clasp_app.cpp")
set(clingo_public_scope_ PUBLIC)
set(clingo_private_scope_ PRIVATE)
@@ -62,7 +60,7 @@
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
${clingo_private_scope_}
- "$<BUILD_INTERFACE:${CLASP_SOURCE_DIR}/app>")
+ "/usr/include/clasp/cli")
target_compile_definitions(libclingo ${clingo_private_scope_} CLINGO_BUILD_LIBRARY)
if (NOT CLINGO_BUILD_SHARED)