Update to Z3 4.8.7 and cherry-pick build fix commit

scripts/deps-ppa/static_z3.sh

@@ -25,7 +25,9 @@ set -ev
 keyid=70D110489D66E2F6
 email=builds@ethereum.org
 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"
 
@@ -40,9 +42,12 @@ pparepo=cpp-build-deps
 ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files
 
 # 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
-debversion="$version"
+# Patch build failure.
+git cherry-pick e212159f4e
+
+debversion="${version}${version_patchsuffix}"
 
 CMAKE_OPTIONS="-DBUILD_LIBZ3_SHARED=OFF -DCMAKE_BUILD_TYPE=Release"
 
@@ -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".
 EOF
 cat <<EOF > debian/changelog
-libz3-static-dev (0.0.1-0ubuntu1) saucy; urgency=low
+libz3-static-dev (0.0.1-1ubuntu0) saucy; urgency=low
 
   * Initial release.
 
@@ -186,7 +191,7 @@ mkdir debian/source
 echo "3.0 (quilt)" > debian/source/format
 chmod +x debian/rules
 
-versionsuffix=0ubuntu1~${distribution}
+versionsuffix=1ubuntu0~${distribution}
 EMAIL="$email" dch -v 1:${debversion}-${versionsuffix} "build of ${version}"
 
 # build source package