commit
be26c089e2
@ -1,4 +1,4 @@
|
|||||||
From 206084d2e08198b0b5b67733c407bd3fb74affb1 Mon Sep 17 00:00:00 2001
|
From 714f5ebe9ade721abdccf58edfcddba52465cb8d Mon Sep 17 00:00:00 2001
|
||||||
From: Jiajie Chen <c@jia.je>
|
From: Jiajie Chen <c@jia.je>
|
||||||
Date: Sun, 2 Jul 2023 22:43:27 +0800
|
Date: Sun, 2 Jul 2023 22:43:27 +0800
|
||||||
Subject: [PATCH] Do not download sources in cmake
|
Subject: [PATCH] Do not download sources in cmake
|
||||||
@ -8,7 +8,7 @@ Subject: [PATCH] Do not download sources in cmake
|
|||||||
1 file changed, 1 insertion(+), 10 deletions(-)
|
1 file changed, 1 insertion(+), 10 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/solvers/CMakeLists.txt b/src/solvers/CMakeLists.txt
|
diff --git a/src/solvers/CMakeLists.txt b/src/solvers/CMakeLists.txt
|
||||||
index 8bfcf4d13c..6ba858a461 100644
|
index daa0853a57..4bcbbdaa47 100644
|
||||||
--- a/src/solvers/CMakeLists.txt
|
--- a/src/solvers/CMakeLists.txt
|
||||||
+++ b/src/solvers/CMakeLists.txt
|
+++ b/src/solvers/CMakeLists.txt
|
||||||
@@ -123,16 +123,6 @@ foreach(SOLVER ${sat_impl})
|
@@ -123,16 +123,6 @@ foreach(SOLVER ${sat_impl})
|
||||||
@ -16,11 +16,11 @@ index 8bfcf4d13c..6ba858a461 100644
|
|||||||
message(STATUS "Building solvers with cadical")
|
message(STATUS "Building solvers with cadical")
|
||||||
|
|
||||||
- download_project(PROJ cadical
|
- download_project(PROJ cadical
|
||||||
- URL https://github.com/arminbiere/cadical/archive/rel-1.5.3.tar.gz
|
- URL https://github.com/arminbiere/cadical/archive/rel-1.7.2.tar.gz
|
||||||
- PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-1.5.3-patch
|
- PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-1.7.2-patch
|
||||||
- COMMAND cmake -E copy ${CBMC_SOURCE_DIR}/../scripts/cadical_CMakeLists.txt CMakeLists.txt
|
- COMMAND cmake -E copy ${CBMC_SOURCE_DIR}/../scripts/cadical_CMakeLists.txt CMakeLists.txt
|
||||||
- COMMAND ./configure
|
- COMMAND ./configure
|
||||||
- URL_MD5 265b1a715000ed3c5b6de36ddd1278a0
|
- URL_MD5 be646831a017f81b300664e58deba1b5
|
||||||
- )
|
- )
|
||||||
-
|
-
|
||||||
- add_subdirectory(${cadical_SOURCE_DIR} ${cadical_BINARY_DIR})
|
- add_subdirectory(${cadical_SOURCE_DIR} ${cadical_BINARY_DIR})
|
||||||
@ -32,10 +32,10 @@ index 8bfcf4d13c..6ba858a461 100644
|
|||||||
target_include_directories(solvers
|
target_include_directories(solvers
|
||||||
PUBLIC
|
PUBLIC
|
||||||
${cadical_SOURCE_DIR}/src
|
${cadical_SOURCE_DIR}/src
|
||||||
+ ${cadical_INCLUDE_DIR}
|
+ ${cadical_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(solvers cadical)
|
target_link_libraries(solvers cadical)
|
||||||
--
|
--
|
||||||
2.40.1
|
2.42.0
|
||||||
|
|
||||||
|
@ -13,13 +13,13 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cbmc";
|
pname = "cbmc";
|
||||||
version = "5.91.0";
|
version = "5.95.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "diffblue";
|
owner = "diffblue";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "${pname}-${version}";
|
rev = "${pname}-${version}";
|
||||||
sha256 = "sha256-7DzhGEDS9T6WIjGoxOw9Gf/q+tYNFJDPbQUBV3tbn/I=";
|
sha256 = "sha256-fDLSo5EeHyPTliAqFp+5mfaB0iZXIMXeMyF21fjl5k4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
|
|||||||
license = licenses.bsdOriginal;
|
license = licenses.bsdOriginal;
|
||||||
maintainers = with maintainers; [ jiegec ];
|
maintainers = with maintainers; [ jiegec ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
# https://github.com/diffblue/cbmc/issues/7423
|
# error: no member named 'aligned_alloc' in the global namespace
|
||||||
broken = stdenv.isLinux && stdenv.isAarch64;
|
broken = stdenv.isDarwin && stdenv.isx86_64;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user