From 8ed6b7050bf1dc751ca15eb76e9faa5f18a92a5a Mon Sep 17 00:00:00 2001 From: kiwiidb Date: Tue, 5 Apr 2022 11:18:30 +0200 Subject: [PATCH] build: bump zlib dependency --- .github/scripts/build.sh | 8 ++++---- Dockerfile | 8 ++++---- contrib/docker/linuxarm32v7.Dockerfile | 8 ++++---- contrib/docker/linuxarm64v8.Dockerfile | 8 ++++---- contrib/docker/scripts/build.sh | 8 ++++---- doc/INSTALL.md | 6 +++--- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh index 05cece10f..bfbb97eb9 100755 --- a/.github/scripts/build.sh +++ b/.github/scripts/build.sh @@ -51,14 +51,14 @@ then export STRIP="$TARGET_HOST"-strip export CONFIGURATION_WRAPPER=qemu-"${TARGET_HOST%%-*}"-static - wget -q https://zlib.net/zlib-1.2.11.tar.gz - tar xf zlib-1.2.11.tar.gz - cd zlib-1.2.11 || exit 1 + wget -q https://zlib.net/zlib-1.2.12.tar.gz + tar xf zlib-1.2.12.tar.gz + cd zlib-1.2.12 || exit 1 ./configure --prefix="$QEMU_LD_PREFIX" make sudo make install cd .. || exit 1 - rm zlib-1.2.11.tar.gz && rm -rf zlib-1.2.11 + rm zlib-1.2.12.tar.gz && rm -rf zlib-1.2.12 wget -q https://www.sqlite.org/2018/sqlite-src-3260000.zip unzip -q sqlite-src-3260000.zip diff --git a/Dockerfile b/Dockerfile index 5e4efddf4..47f335b9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -70,12 +70,12 @@ RUN apt-get update -qq && \ python3-setuptools \ wget -RUN wget -q https://zlib.net/zlib-1.2.11.tar.gz \ -&& tar xvf zlib-1.2.11.tar.gz \ -&& cd zlib-1.2.11 \ +RUN wget -q https://zlib.net/zlib-1.2.12.tar.gz \ +&& tar xvf zlib-1.2.12.tar.gz \ +&& cd zlib-1.2.12 \ && ./configure \ && make \ -&& make install && cd .. && rm zlib-1.2.11.tar.gz && rm -rf zlib-1.2.11 +&& make install && cd .. && rm zlib-1.2.12.tar.gz && rm -rf zlib-1.2.12 RUN apt-get install -y --no-install-recommends unzip tclsh \ && wget -q https://www.sqlite.org/2019/sqlite-src-3290000.zip \ diff --git a/contrib/docker/linuxarm32v7.Dockerfile b/contrib/docker/linuxarm32v7.Dockerfile index fe843a51d..7120befb5 100644 --- a/contrib/docker/linuxarm32v7.Dockerfile +++ b/contrib/docker/linuxarm32v7.Dockerfile @@ -62,12 +62,12 @@ STRIP=${target_host}-strip \ QEMU_LD_PREFIX=/usr/${target_host} \ HOST=${target_host} -RUN wget -q https://zlib.net/zlib-1.2.11.tar.gz \ -&& tar xvf zlib-1.2.11.tar.gz \ -&& cd zlib-1.2.11 \ +RUN wget -q https://zlib.net/zlib-1.2.12.tar.gz \ +&& tar xvf zlib-1.2.12.tar.gz \ +&& cd zlib-1.2.12 \ && ./configure --prefix=$QEMU_LD_PREFIX \ && make \ -&& make install && cd .. && rm zlib-1.2.11.tar.gz && rm -rf zlib-1.2.11 +&& make install && cd .. && rm zlib-1.2.12.tar.gz && rm -rf zlib-1.2.12 RUN apt-get install -y --no-install-recommends unzip tclsh \ && wget -q https://www.sqlite.org/2019/sqlite-src-3290000.zip \ diff --git a/contrib/docker/linuxarm64v8.Dockerfile b/contrib/docker/linuxarm64v8.Dockerfile index 4c461b688..ff4e65af7 100644 --- a/contrib/docker/linuxarm64v8.Dockerfile +++ b/contrib/docker/linuxarm64v8.Dockerfile @@ -62,12 +62,12 @@ STRIP=${target_host}-strip \ QEMU_LD_PREFIX=/usr/${target_host} \ HOST=${target_host} -RUN wget -q https://zlib.net/zlib-1.2.11.tar.gz \ -&& tar xvf zlib-1.2.11.tar.gz \ -&& cd zlib-1.2.11 \ +RUN wget -q https://zlib.net/zlib-1.2.12.tar.gz \ +&& tar xvf zlib-1.2.12.tar.gz \ +&& cd zlib-1.2.12 \ && ./configure --prefix=$QEMU_LD_PREFIX \ && make \ -&& make install && cd .. && rm zlib-1.2.11.tar.gz && rm -rf zlib-1.2.11 +&& make install && cd .. && rm zlib-1.2.12.tar.gz && rm -rf zlib-1.2.12 RUN apt-get install -y --no-install-recommends unzip tclsh \ && wget -q https://www.sqlite.org/2019/sqlite-src-3290000.zip \ diff --git a/contrib/docker/scripts/build.sh b/contrib/docker/scripts/build.sh index 1650e793c..c54173d42 100755 --- a/contrib/docker/scripts/build.sh +++ b/contrib/docker/scripts/build.sh @@ -52,14 +52,14 @@ then export STRIP="$TARGET_HOST"-strip export CONFIGURATION_WRAPPER=qemu-"${TARGET_HOST%%-*}"-static - wget -q https://zlib.net/zlib-1.2.11.tar.gz - tar xf zlib-1.2.11.tar.gz - cd zlib-1.2.11 || exit 1 + wget -q https://zlib.net/zlib-1.2.12.tar.gz + tar xf zlib-1.2.12.tar.gz + cd zlib-1.2.12 || exit 1 ./configure --prefix="$QEMU_LD_PREFIX" make sudo make install cd .. || exit 1 - rm zlib-1.2.11.tar.gz && rm -rf zlib-1.2.11 + rm zlib-1.2.12.tar.gz && rm -rf zlib-1.2.12 wget -q https://www.sqlite.org/2018/sqlite-src-3260000.zip unzip -q sqlite-src-3260000.zip diff --git a/doc/INSTALL.md b/doc/INSTALL.md index b01c88e97..42c994259 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -343,9 +343,9 @@ Obtain and install cross-compiled versions of sqlite3, gmp and zlib: Download and build zlib: - wget https://zlib.net/zlib-1.2.11.tar.gz - tar xvf zlib-1.2.11.tar.gz - cd zlib-1.2.11 + wget https://zlib.net/zlib-1.2.12.tar.gz + tar xvf zlib-1.2.12.tar.gz + cd zlib-1.2.12 ./configure --prefix=$QEMU_LD_PREFIX make make install