Refactor all

3 files changed, 3 insertions, 24 deletions

diff --git a/etc/tasks/001-packages.sh b/etc/tasks/001-packages.sh
index fabad6e..5d20ee7 100755
--- a/etc/tasks/001-packages.sh
+++ b/etc/tasks/001-packages.sh
@@ -1,18 +1,10 @@
 #!/bin/bash
-set -e
 set -x
 
-prefix="${TOOLCHAIN}"
 sysconfdir="${TOOLCHAIN_BUILD}/etc"
 reqdir=${sysconfdir}/pkgs
 blddir=builds
 
-export PATH="${prefix}/bin:${PATH}"
-export CFLAGS="-I${prefix}/include"
-export LDFLAGS="-L${prefix}/lib -Wl,-rpath=${prefix}/lib"
-export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
-export PREFIX="${prefix}"
-
 function pre()
 {
     if [[ ! -d ${reqdir} ]]; then
diff --git a/etc/tasks/002-python-packages.sh b/etc/tasks/002-python-packages.sh
index 9218a8e..bcd0b6f 100755
--- a/etc/tasks/002-python-packages.sh
+++ b/etc/tasks/002-python-packages.sh
@@ -1,16 +1,9 @@
 #!/bin/bash
 set -x
 
-# Uses GLOBAL environment variable: PYTHON_VERSION defined by `docker build` argument
-prefix="${TOOLCHAIN}"
 sysconfdir="${TOOLCHAIN_BUILD}/etc"
 reqdir=${sysconfdir}/pip
 
-export PATH="${prefix}/bin:${PATH}"
-export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
-export CFLAGS="-I${prefix}/include"
-export LDFLAGS="-L${prefix}/lib -Wl,-rpath=${prefix}/lib"
-
 function pre()
 {
     if [[ ! -d ${reqdir} ]]; then
diff --git a/etc/tasks/999-clean.sh b/etc/tasks/999-clean.sh
index c791ec5..e4e8d13 100755
--- a/etc/tasks/999-clean.sh
+++ b/etc/tasks/999-clean.sh
@@ -4,22 +4,16 @@ if [[ ! -f /.dockerenv ]]; then
     exit 1
 fi
 
-packages=(
-    gcc
-    gcc-c++
-    gcc-gfortran
-)
-sudo yum remove -y "${packages[@]}"
 sudo yum clean all
 
-# Remove all static libraries
-sudo find "${TOOLCHAIN_LIB}" -name '*.a' -delete
-
 sudo rm -rf "${HOME}/.astropy"
 sudo rm -rf "${HOME}"/*
 sudo rm -rf /tmp/*
 sudo rm -rf /var/cache/yum
 
+# Ensure new shared libraries ingested
+sudo ldconfig
+
 for logfile in /var/log/*
 do
     [[ -f ${logfile} ]] && sudo truncate --size=0 "${logfile}"