Merge pull request #7879 from ethereum/updateZ3PPAScript

Update to Z3 4.8.7 and cherry-pick build fix commit
This commit is contained in:
Daniel Kirchner 2019-12-03 18:50:24 +01:00 committed by GitHub
commit 361801b94c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions

View File

@ -25,7 +25,9 @@ set -ev
keyid=70D110489D66E2F6 keyid=70D110489D66E2F6
email=builds@ethereum.org email=builds@ethereum.org
packagename=libz3-static-dev packagename=libz3-static-dev
version=4.8.6 # On the next version the git cherry-pick below should be removed and the patch suffix removed from the version string.
version=4.8.7
version_patchsuffix=-1
DISTRIBUTIONS="bionic disco eoan" DISTRIBUTIONS="bionic disco eoan"
@ -40,11 +42,14 @@ pparepo=cpp-build-deps
ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files
# Fetch source # Fetch source
git clone --depth 1 --branch z3-${version} https://github.com/Z3Prover/z3.git git clone --branch z3-${version} https://github.com/Z3Prover/z3.git
cd z3 cd z3
debversion="$version" # Patch build failure.
git cherry-pick e212159f4e
CMAKE_OPTIONS="-DBUILD_LIBZ3_SHARED=OFF -DCMAKE_BUILD_TYPE=Release" debversion="${version}${version_patchsuffix}"
CMAKE_OPTIONS="-DZ3_BUILD_LIBZ3_SHARED=OFF -DCMAKE_BUILD_TYPE=Release"
# gzip will create different tars all the time and we are not allowed # gzip will create different tars all the time and we are not allowed
# to upload the same file twice with different contents, so we only # to upload the same file twice with different contents, so we only
@ -176,7 +181,7 @@ This program is free software: you can redistribute it and/or modify
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
EOF EOF
cat <<EOF > debian/changelog cat <<EOF > debian/changelog
libz3-static-dev (0.0.1-0ubuntu1) saucy; urgency=low libz3-static-dev (0.0.1-2ubuntu0) saucy; urgency=low
* Initial release. * Initial release.
@ -186,7 +191,7 @@ mkdir debian/source
echo "3.0 (quilt)" > debian/source/format echo "3.0 (quilt)" > debian/source/format
chmod +x debian/rules chmod +x debian/rules
versionsuffix=0ubuntu1~${distribution} versionsuffix=2ubuntu0~${distribution}
EMAIL="$email" dch -v 1:${debversion}-${versionsuffix} "build of ${version}" EMAIL="$email" dch -v 1:${debversion}-${versionsuffix} "build of ${version}"
# build source package # build source package

View File

@ -1,9 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
git clone --depth 1 --branch z3-4.8.1 https://github.com/Z3Prover/z3.git git clone --depth 1 --branch z3-4.8.7 https://github.com/Z3Prover/z3.git
cd z3 cd z3
mkdir build mkdir build
cd build cd build
LDFLAGS="-static" cmake -DBUILD_LIBZ3_SHARED=OFF .. LDFLAGS="-static" cmake -DZ3_BUILD_LIBZ3_SHARED=OFF ..
make -j 4 make -j 4
make install make install