Merge pull request #12078 from elopio/snap/use-antlr-package

Snap: update cvc4 to 1.8
ethereum · Oct 4, 2021 · 1d1b9fd · 1d1b9fd
2 parents 385f64e + 559fab3
commit 1d1b9fd
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -40,7 +40,7 @@ parts:
  source: https://github.com/Z3Prover/z3.git
  source-tag: z3-4.8.4
  plugin: make
- build-packages: [python]
+ build-packages: [python3]
  stage-packages: [libstdc++6]
  override-build: |
  python scripts/mk_make.py
@@ -49,14 +49,13 @@ parts:
  make install DESTDIR=$SNAPCRAFT_PART_INSTALL
  cvc4:
  source: https://github.com/CVC4/CVC4.git
- source-tag: "1.7"
+ source-tag: "1.8"
  plugin: nil
- build-packages: [python, cmake, openjdk-11-jre, libgmp-dev, wget]
+ build-packages: [python3, python3-toml, cmake, openjdk-11-jre, libgmp-dev, wget, antlr3, libantlr3c-3.4-0, libantlr3c-dev]
  override-build: |
- ./contrib/get-antlr-3.4
- ./configure.sh --prefix=$SNAPCRAFT_STAGE/usr
+ ./configure.sh --python3 --prefix=$SNAPCRAFT_STAGE/usr
  cd build
  make -j -l $(grep -c "^processor" /proc/cpuinfo)
  make install
  mkdir -p $SNAPCRAFT_PART_INSTALL/usr/lib/
- cp $SNAPCRAFT_STAGE/usr/lib/libcvc4.so.6 $SNAPCRAFT_PART_INSTALL/usr/lib/
+ cp $SNAPCRAFT_STAGE/usr/lib/libcvc4.so.7 $SNAPCRAFT_PART_INSTALL/usr/lib/