boolector: 3.2.2 -> 3.2.3 + upstream patch for C++14 compatibility.
https://github.com/Boolector/boolector/compare/3.2.2...3.2.3
cc13f371c0
This commit is contained in:
parent
a331a49cf7
commit
f0b157a764
|
@ -1,16 +0,0 @@
|
||||||
diff --git a/cmake/googletest-download.cmake b/cmake/googletest-download.cmake
|
|
||||||
index 0ec4d558..d0910313 100644
|
|
||||||
--- a/cmake/googletest-download.cmake
|
|
||||||
+++ b/cmake/googletest-download.cmake
|
|
||||||
@@ -9,10 +9,7 @@ ExternalProject_Add(
|
|
||||||
googletest
|
|
||||||
SOURCE_DIR "@GOOGLETEST_DOWNLOAD_ROOT@/googletest-src"
|
|
||||||
BINARY_DIR "@GOOGLETEST_DOWNLOAD_ROOT@/googletest-build"
|
|
||||||
- GIT_REPOSITORY
|
|
||||||
- https://github.com/google/googletest.git
|
|
||||||
- GIT_TAG
|
|
||||||
- release-1.10.0
|
|
||||||
+ URL REPLACEME
|
|
||||||
CONFIGURE_COMMAND ""
|
|
||||||
BUILD_COMMAND ""
|
|
||||||
INSTALL_COMMAND ""
|
|
|
@ -4,34 +4,31 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "boolector";
|
pname = "boolector";
|
||||||
version = "3.2.2";
|
version = "3.2.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "boolector";
|
owner = "boolector";
|
||||||
repo = "boolector";
|
repo = "boolector";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1smcy6yp8wvnw2brgnv5bf40v87k4v4fbdbrhi7987vja632k50z";
|
hash = "sha256-CdfpXUbU1+yEmrNyl+hvHlJfpzzzx356naim6vRafDg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# present in master - remove after 3.2.2
|
# present in master - remove after 3.2.3
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
name = "fix-parser-getc-char-casts.patch";
|
name = "update-unit-tests-to-cpp-14.patch";
|
||||||
url = "https://github.com/Boolector/boolector/commit/cc3a70918538c1e71ea5e7273fa1ac098da37c1b.patch";
|
url = "https://github.com/Boolector/boolector/commit/cc13f371c0c5093d98638ddd213dc835ef3aadf3.patch";
|
||||||
sha256 = "0pjvagcy74vxa2q75zbshcz8j7rvhl98549xfcf5y8yyxf5h8hyq";
|
hash = "sha256-h8DBhAvUu+wXBwmvwRhHnJv3XrbEpBpvX9D1FI/+avc=";
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
nativeBuildInputs = [ cmake gtest ];
|
||||||
sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
|
||||||
buildInputs = [ lingeling btor2tools gmp ];
|
buildInputs = [ lingeling btor2tools gmp ];
|
||||||
|
|
||||||
cmakeFlags =
|
cmakeFlags =
|
||||||
[ "-DBUILD_SHARED_LIBS=ON"
|
[ "-DBUILD_SHARED_LIBS=ON"
|
||||||
"-DUSE_LINGELING=YES"
|
"-DUSE_LINGELING=YES"
|
||||||
|
"-DBtor2Tools_INCLUDE_DIR=${btor2tools.dev}/include/btor2parser"
|
||||||
] ++ (lib.optional (gmp != null) "-DUSE_GMP=YES");
|
] ++ (lib.optional (gmp != null) "-DUSE_GMP=YES");
|
||||||
|
|
||||||
nativeCheckInputs = [ python3 ];
|
nativeCheckInputs = [ python3 ];
|
||||||
|
|
Loading…
Reference in New Issue
Block a user