From dd4954f5937daa1aada5949f3ed711b9e55b07e0 Mon Sep 17 00:00:00 2001 From: Martin Nowack Date: Thu, 4 Apr 2019 11:15:34 +0100 Subject: Use newer versions of solver components used by MetaSMT Add dependencies for newer build Add support to `git cherry-pick` commits without author/email defined --- scripts/build/p-metasmt-linux-ubuntu-16.04.inc | 2 ++ scripts/build/p-metasmt.inc | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'scripts/build') diff --git a/scripts/build/p-metasmt-linux-ubuntu-16.04.inc b/scripts/build/p-metasmt-linux-ubuntu-16.04.inc index 063a5cd3..583f869a 100644 --- a/scripts/build/p-metasmt-linux-ubuntu-16.04.inc +++ b/scripts/build/p-metasmt-linux-ubuntu-16.04.inc @@ -20,6 +20,8 @@ install_build_dependencies_metasmt() { flex unzip python + autoconf + python3 ) #Install essential dependencies diff --git a/scripts/build/p-metasmt.inc b/scripts/build/p-metasmt.inc index 7ba2d471..559a0aae 100644 --- a/scripts/build/p-metasmt.inc +++ b/scripts/build/p-metasmt.inc @@ -16,11 +16,15 @@ download_metasmt() { } build_metasmt() { + # MetaSMT might need to cherry-pick some git commits, but git requires email and user to be set to do this operation + # Provide a temporary value for this + export GIT_COMMITTER_EMAIL="foo@bar" + export GIT_COMMITTER_NAME="foobar" cd "${METASMT_SRC_PATH}" ./bootstrap.sh -d deps -m RELEASE build -DmetaSMT_ENABLE_TESTS=off \ - --build stp-git-basic --build boolector-2.2.0 --build minisat-git \ - --build lingeling-ayv-86bf266-140429 --build yices-2.5.1 --build Z3-4.4.1 \ - --build cvc4-1.5 \ + --build stp-git-basic --build boolector-3.0.0 --build minisat-git \ + --build lingeling-bbc-9230380-161217 --build yices-2.6.1 --build Z3-4.8.4 \ + --build cvc4-1.6 \ --deps "${METASMT_DEPS_PATH}/" \ --install "${METASMT_INSTALL_PATH}/" \ -j "$(nproc)" \ -- cgit 1.4.1