diff --git a/.github/workflows/build-and-test-Xen.yaml b/.github/workflows/build-and-test-Xen.yaml index c424cf2fc54..16ed5466faf 100644 --- a/.github/workflows/build-and-test-Xen.yaml +++ b/.github/workflows/build-and-test-Xen.yaml @@ -17,7 +17,7 @@ jobs: # user input DEBIAN_FRONTEND: noninteractive run: | - sudo apt-get install --no-install-recommends -y coreutils build-essential gcc git make flex bison software-properties-common libwww-perl python + sudo apt-get install --no-install-recommends -y coreutils build-essential gcc git make flex bison software-properties-common curl python sudo apt-get install --no-install-recommends -y bin86 gdb bcc liblzma-dev python-dev gettext iasl uuid-dev libncurses5-dev libncursesw5-dev pkg-config sudo apt-get install --no-install-recommends -y libgtk2.0-dev libyajl-dev sudo time ccache diff --git a/COMPILING.md b/COMPILING.md index f55a8dc9ccb..96bf7f1d4f4 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -21,17 +21,17 @@ We assume that you have a Debian/Ubuntu or Red Hat-like distribution. The GNU Make needs to be version 3.81 or higher. On Debian-like distributions, do as root: ``` - apt-get install g++ gcc flex bison make git libwww-perl patch + apt-get install g++ gcc flex bison make git curl patch ``` On Red Hat/Fedora or derivates, do as root: ``` - dnf install gcc gcc-c++ flex bison perl-libwww-perl patch + dnf install gcc gcc-c++ flex bison curl patch ``` Note that you need g++ version 5.0 or newer. On Amazon Linux and similar distributions, do as root: ``` - yum install gcc72-c++ flex bison perl-libwww-perl patch tar + yum install gcc72-c++ flex bison curl patch tar ``` To compile JBMC, you additionally need the JDK and Maven 3. You also @@ -153,7 +153,7 @@ Follow these instructions: 1. First install Cygwin, then from the Cygwin setup facility install the following packages: `flex, bison, tar, gzip, git, make, wget, patch, - libwww-perl`. + curl`. 2. Get the CBMC source via ``` git clone https://github.com/diffblue/cbmc cbmc-git diff --git a/buildspec-linux-clang-3.8.yml b/buildspec-linux-clang-3.8.yml index e7d8fe0312f..a5a8813c1d4 100644 --- a/buildspec-linux-clang-3.8.yml +++ b/buildspec-linux-clang-3.8.yml @@ -10,7 +10,7 @@ phases: commands: - sed -i 's#/archive.ubuntu.com#/us-east-1.ec2.archive.ubuntu.com#g' /etc/apt/sources.list - apt-get update -y - - apt-get install -y clang-3.8 flex bison make git libwww-perl patch ccache libc6-dev-i386 jq openjdk-8-jdk maven + - apt-get install -y clang-3.8 flex bison make git curl patch ccache libc6-dev-i386 jq openjdk-8-jdk maven build: commands: - echo Build started on `date` diff --git a/buildspec-linux-clang.yml b/buildspec-linux-clang.yml index ec78098a47f..ff790c8eb5c 100644 --- a/buildspec-linux-clang.yml +++ b/buildspec-linux-clang.yml @@ -14,7 +14,7 @@ phases: - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - - add-apt-repository 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main' - apt-get update -y - - apt-get install -y clang-8 flex bison make git libwww-perl patch ccache libc6-dev-i386 jq gdb + - apt-get install -y clang-8 flex bison make git curl patch ccache libc6-dev-i386 jq gdb build: commands: - echo Build started on `date` diff --git a/buildspec-linux-cmake-gcc-cov.yml b/buildspec-linux-cmake-gcc-cov.yml index e4f960bd4cd..38690fb6fa7 100644 --- a/buildspec-linux-cmake-gcc-cov.yml +++ b/buildspec-linux-cmake-gcc-cov.yml @@ -13,7 +13,7 @@ phases: - sed -i 's#/archive.ubuntu.com#/us-east-1.ec2.archive.ubuntu.com#g' /etc/apt/sources.list - add-apt-repository ppa:ubuntu-toolchain-r/test - apt-get update -y - - apt-get install -y flex bison make git libwww-perl patch ccache libc6-dev-i386 jq lcov cmake curl gdb + - apt-get install -y flex bison make git curl patch ccache libc6-dev-i386 jq lcov cmake curl gdb build: commands: - echo Build started on `date` diff --git a/buildspec-linux-cmake-gcc.yml b/buildspec-linux-cmake-gcc.yml index 1e7973272f7..51ba6a538cf 100644 --- a/buildspec-linux-cmake-gcc.yml +++ b/buildspec-linux-cmake-gcc.yml @@ -12,7 +12,7 @@ phases: commands: - sed -i 's#/archive.ubuntu.com#/us-east-1.ec2.archive.ubuntu.com#g' /etc/apt/sources.list - apt-get update -y - - apt-get install -y flex bison make git libwww-perl patch ccache libc6-dev-i386 jq cmake + - apt-get install -y flex bison make git curl patch ccache libc6-dev-i386 jq cmake build: commands: - echo Build started on `date` diff --git a/buildspec-linux-make-gcc-cov.yml b/buildspec-linux-make-gcc-cov.yml index 269b5778d45..6950a03d5e4 100644 --- a/buildspec-linux-make-gcc-cov.yml +++ b/buildspec-linux-make-gcc-cov.yml @@ -12,7 +12,7 @@ phases: commands: - sed -i 's#/archive.ubuntu.com#/us-east-1.ec2.archive.ubuntu.com#g' /etc/apt/sources.list - apt-get update -y - - apt-get install -y flex bison make git libwww-perl patch ccache libc6-dev-i386 jq gdb lcov curl + - apt-get install -y flex bison make git curl patch ccache libc6-dev-i386 jq gdb lcov curl build: commands: - echo Build started on `date` diff --git a/buildspec.yml b/buildspec.yml index 078896c1477..add9840d7fd 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -13,7 +13,7 @@ phases: commands: - sed -i 's#/archive.ubuntu.com#/us-east-1.ec2.archive.ubuntu.com#g' /etc/apt/sources.list - apt-get update -y - - apt-get install -y flex bison make git libwww-perl patch ccache libc6-dev-i386 jq gdb libxml2-utils + - apt-get install -y flex bison make git curl patch ccache libc6-dev-i386 jq gdb libxml2-utils build: commands: - echo Build started on `date` diff --git a/integration/xen/Dockerfile b/integration/xen/Dockerfile index ed11b140c6a..dbbdab403b6 100644 --- a/integration/xen/Dockerfile +++ b/integration/xen/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 RUN apt-get update && apt-get --no-install-recommends -y install \ build-essential gcc git make flex bison \ - software-properties-common libwww-perl python \ + software-properties-common curl python \ bin86 gdb bcc liblzma-dev python-dev gettext iasl \ uuid-dev libncurses5-dev libncursesw5-dev pkg-config \ libgtk2.0-dev libyajl-dev sudo time diff --git a/src/Makefile b/src/Makefile index 5f5812c153d..19058120bd2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -115,7 +115,7 @@ $(patsubst %, %_clean, $(DIRS)): # minisat2 and glucose download, for your convenience -DOWNLOADER = lwp-download +DOWNLOADER = curl -L --remote-name TAR = tar minisat2-download: @@ -155,11 +155,13 @@ glucose-download: cadical_release = rel-06w cadical-download: @echo "Downloading CaDiCaL $(cadical_release)" - @curl -L https://github.com/arminbiere/cadical/archive/$(cadical_release).tar.gz | tar xz + @$(DOWNLOADER) https://github.com/arminbiere/cadical/archive/$(cadical_release).tar.gz + @$(TAR) xfz $(cadical_release).tar.gz @rm -Rf ../cadical @mv cadical-$(cadical_release) ../cadical @(cd ../cadical; patch -p1 < ../scripts/cadical-patch) @cd ../cadical && CXX=$(CXX) CXXFLAGS=-O3 ./configure --debug && make + @$(RM) $(cadical_release).tar.gz doc : doxygen