diff options
Diffstat (limited to 'build')
| -rwxr-xr-x | build/ci/github_actions/macos.sh | 19 | ||||
| -rw-r--r-- | build/cmake/config.h.in | 1 | ||||
| -rw-r--r-- | build/release/Dockerfile | 6 | ||||
| -rw-r--r-- | build/version | 2 |
4 files changed, 23 insertions, 5 deletions
diff --git a/build/ci/github_actions/macos.sh b/build/ci/github_actions/macos.sh index e51574cb6dfab..ba72b4a771784 100755 --- a/build/ci/github_actions/macos.sh +++ b/build/ci/github_actions/macos.sh @@ -1,9 +1,24 @@ #!/bin/sh if [ "$1" = "prepare" ] then - set -x -e + set -x + brew uninstall openssl@1.0.2t > /dev/null + brew uninstall python@2.7.17 > /dev/null + brew untap local/openssl > /dev/null + brew untap local/python2 > /dev/null brew update > /dev/null - for pkg in autoconf automake libtool pkg-config cmake xz lz4 zstd + brew upgrade > /dev/null + set -x -e + for pkg in \ + autoconf \ + automake \ + libtool \ + pkg-config \ + cmake \ + xz \ + lz4 \ + zstd \ + openssl do brew list $pkg > /dev/null && brew upgrade $pkg || brew install $pkg done diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in index fcbd80c5a1715..6d2fa746927c5 100644 --- a/build/cmake/config.h.in +++ b/build/cmake/config.h.in @@ -1,4 +1,5 @@ /* config.h. Generated from build/cmake/config.h.in by cmake configure */ +#define __LIBARCHIVE_CONFIG_H_INCLUDED 1 /* * Ensure we have C99-style int64_t, etc, all defined. diff --git a/build/release/Dockerfile b/build/release/Dockerfile index fc920b6ec8be4..619b67f4b626c 100644 --- a/build/release/Dockerfile +++ b/build/release/Dockerfile @@ -1,5 +1,7 @@ -FROM ubuntu:18.04 -RUN apt-get update && apt-get install -y build-essential autoconf automake libtool pkg-config cmake libssl-dev libacl1-dev libbz2-dev liblzma-dev liblz4-dev libzstd-dev lzop groff ghostscript bsdmainutils zip +FROM ubuntu:20.04 +ENV DEBIAN_FRONTEND=noninteractive +RUN ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime +RUN apt-get update && apt-get install -y build-essential autoconf automake libtool pkg-config cmake zlib1g-dev libssl-dev libacl1-dev libbz2-dev liblzma-dev liblz4-dev libzstd-dev lzop groff ghostscript bsdmainutils zip ADD . $HOME/libarchive/ ADD "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" $HOME/libarchive/build/autoconf/config.guess ADD "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" $HOME/libarchive/build/autoconf/config.sub diff --git a/build/version b/build/version index 2e3400d77cb27..4c8608b0a0f6e 100644 --- a/build/version +++ b/build/version @@ -1 +1 @@ -3004003 +3005000 |