Skip to content

Commit

Permalink
Update autoconf from 2.69 to 2.70
Browse files Browse the repository at this point in the history
  • Loading branch information
mayeut committed Jan 31, 2021
1 parent c01aa45 commit 9f438cb
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 0 deletions.
6 changes: 6 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ RUN manylinux-entrypoint /build_scripts/install-runtime-packages.sh && rm /build

COPY build_scripts/build_utils.sh /build_scripts/

COPY build_scripts/install-autoconf.sh /build_scripts/
RUN export AUTOCONF_ROOT=autoconf-2.70 && \
export AUTOCONF_HASH=f05f410fda74323ada4bdc4610db37f8dbd556602ba65bc843edb4d4d4a1b2b7 && \
export AUTOCONF_DOWNLOAD_URL=http://ftp.gnu.org/gnu/autoconf && \
manylinux-entrypoint /build_scripts/install-autoconf.sh

COPY build_scripts/install-automake.sh /build_scripts/
RUN export AUTOMAKE_ROOT=automake-1.16.2 && \
export AUTOMAKE_HASH=b2f361094b410b4acbf4efba7337bdb786335ca09eb2518635a09fb7319ca5c1 && \
Expand Down
48 changes: 48 additions & 0 deletions docker/build_scripts/install-autoconf.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/bin/bash
# Top-level build script called from Dockerfile

# Stop at any error, show all commands
set -exuo pipefail

# Get script directory
MY_DIR=$(dirname "${BASH_SOURCE[0]}")

# Get build utilities
source $MY_DIR/build_utils.sh


# Install newest autoconf
check_var ${AUTOCONF_ROOT}
check_var ${AUTOCONF_HASH}
check_var ${AUTOCONF_DOWNLOAD_URL}

AUTOCONF_VERSION=${AUTOCONF_ROOT#*-}
if autoconf --version > /dev/null 2>&1; then
INSTALLED=$(autoconf --version | head -1 | awk '{ print $NF }')
SMALLEST=$(echo -e "${INSTALLED}\n${AUTOCONF_VERSION}" | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | head -1)
if [ "${SMALLEST}" == "${AUTOCONF_VERSION}" ]; then
echo "skipping installation of autoconf ${AUTOCONF_VERSION}, system provides autoconf ${INSTALLED}"
exit 0
fi
fi


fetch_source ${AUTOCONF_ROOT}.tar.gz ${AUTOCONF_DOWNLOAD_URL}
check_sha256sum ${AUTOCONF_ROOT}.tar.gz ${AUTOCONF_HASH}
tar -zxf ${AUTOCONF_ROOT}.tar.gz
pushd ${AUTOCONF_ROOT}
DESTDIR=/manylinux-rootfs do_standard_install
popd
rm -rf ${AUTOCONF_ROOT} ${AUTOCONF_ROOT}.tar.gz

# Strip what we can
strip_ /manylinux-rootfs

# Install
cp -rf /manylinux-rootfs/* /

# Remove temporary rootfs
rm -rf /manylinux-rootfs

hash -r
autoconf --version

0 comments on commit 9f438cb

Please sign in to comment.