Merge pull request #5945 from ethereum/switchToCVC4ForUbuntu

Switch from Z3 to CVC4 as SMT solver for Ubuntu PPA.
This commit is contained in:
Daniel Kirchner 2019-02-06 17:12:26 +01:00 committed by GitHub
commit 42240a69e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -20,6 +20,7 @@ Bugfixes:
Build System: Build System:
* Add support for continuous fuzzing via Google oss-fuzz * Add support for continuous fuzzing via Google oss-fuzz
* Ubuntu PPA Packages: Use CVC4 as SMT solver instead of Z3
### 0.5.3 (2019-01-22) ### 0.5.3 (2019-01-22)

View File

@ -70,7 +70,7 @@ cd $distribution
if [ $distribution = STATIC ] if [ $distribution = STATIC ]
then then
pparepo=ethereum-static pparepo=ethereum-static
Z3DEPENDENCY="" SMTDEPENDENCY=""
CMAKE_OPTIONS="-DSOLC_LINK_STATIC=On" CMAKE_OPTIONS="-DSOLC_LINK_STATIC=On"
else else
if [ "$branch" = develop ] if [ "$branch" = develop ]
@ -79,7 +79,7 @@ else
else else
pparepo=ethereum pparepo=ethereum
fi fi
Z3DEPENDENCY="libz3-dev, SMTDEPENDENCY="libcvc4-dev,
" "
CMAKE_OPTIONS="" CMAKE_OPTIONS=""
fi fi
@ -127,7 +127,7 @@ Source: solc
Section: science Section: science
Priority: extra Priority: extra
Maintainer: Christian (Buildserver key) <builds@ethereum.org> Maintainer: Christian (Buildserver key) <builds@ethereum.org>
Build-Depends: ${Z3DEPENDENCY}debhelper (>= 9.0.0), Build-Depends: ${SMTDEPENDENCY}debhelper (>= 9.0.0),
cmake, cmake,
g++, g++,
git, git,