Split libtool build in runtime_base image (#967)

Author: mayeut

docker/Dockerfile

@@ -32,6 +32,12 @@ COPY build_scripts/build_utils.sh /build_scripts/
 COPY build_scripts/build_env_runtime.sh /build_scripts/
 RUN manylinux-entrypoint /build_scripts/install-runtime-packages.sh
 
+COPY build_scripts/install-libtool.sh /build_scripts/
+RUN export LIBTOOL_ROOT=libtool-2.4.6 && \
+    export LIBTOOL_HASH=e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3 && \
+    export LIBTOOL_DOWNLOAD_URL=http://ftp.gnu.org/gnu/libtool && \
+    manylinux-entrypoint /build_scripts/install-libtool.sh
+
 COPY build_scripts/install-patchelf.sh /build_scripts/
 RUN export PATCHELF_VERSION=0.12 && \
     export PATCHELF_HASH=3dca33fb862213b3541350e1da262249959595903f559eae0fbc68966e9c3f56 && \

docker/build_scripts/build_env_runtime.sh

@@ -4,6 +4,3 @@ AUTOMAKE_ROOT=automake-1.16.2
 AUTOMAKE_HASH=b2f361094b410b4acbf4efba7337bdb786335ca09eb2518635a09fb7319ca5c1
 AUTOMAKE_DOWNLOAD_URL=http://ftp.gnu.org/gnu/automake
 
-LIBTOOL_ROOT=libtool-2.4.6
-LIBTOOL_HASH=e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3
-LIBTOOL_DOWNLOAD_URL=http://ftp.gnu.org/gnu/libtool

docker/build_scripts/build_utils.sh

@@ -145,17 +145,3 @@ function build_automake {
     (cd ${automake_fname} && do_standard_install)
     rm -rf ${automake_fname} ${automake_fname}.tar.gz
 }
-
-
-function build_libtool {
-    local libtool_fname=$1
-    check_var ${libtool_fname}
-    local libtool_sha256=$2
-    check_var ${libtool_sha256}
-    check_var ${LIBTOOL_DOWNLOAD_URL}
-    fetch_source ${libtool_fname}.tar.gz ${LIBTOOL_DOWNLOAD_URL}
-    check_sha256sum ${libtool_fname}.tar.gz ${libtool_sha256}
-    tar -zxf ${libtool_fname}.tar.gz
-    (cd ${libtool_fname} && do_standard_install)
-    rm -rf ${libtool_fname} ${libtool_fname}.tar.gz
-}

docker/build_scripts/install-libtool.sh

@@ -0,0 +1,27 @@
+#!/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 libtool
+check_var ${LIBTOOL_ROOT}
+check_var ${LIBTOOL_HASH}
+check_var ${LIBTOOL_DOWNLOAD_URL}
+fetch_source ${LIBTOOL_ROOT}.tar.gz ${LIBTOOL_DOWNLOAD_URL}
+check_sha256sum ${LIBTOOL_ROOT}.tar.gz ${LIBTOOL_HASH}
+tar -zxf ${LIBTOOL_ROOT}.tar.gz
+pushd ${LIBTOOL_ROOT}
+do_standard_install
+popd
+rm -rf ${LIBTOOL_ROOT} ${LIBTOOL_ROOT}.tar.gz
+
+
+hash -r
+libtoolize --version

docker/build_scripts/install-runtime-packages.sh

@@ -126,10 +126,6 @@ fi
 build_automake $AUTOMAKE_ROOT $AUTOMAKE_HASH
 automake --version
 
-# Install newest libtool
-build_libtool $LIBTOOL_ROOT $LIBTOOL_HASH
-libtool --version
-
 # Strip what we can -- and ignore errors, because this just attempts to strip
 # *everything*, including non-ELF files:
 find /usr/local -type f -print0 | xargs -0 -n1 strip --strip-unneeded 2>/dev/null || true