6 files changed, 19 insertions, 20 deletions
diff --git a/etc/pkgs/000-dummy.sh b/etc/pkgs/000-dummy.sh
index 06bd986..06bd986 100644..100755
--- a/etc/pkgs/000-dummy.sh
+++ b/etc/pkgs/000-dummy.sh
diff --git a/etc/tasks/001-openssl.sh b/etc/pkgs/001-openssl.sh
index 1f99fe8..fe7aad8 100755
--- a/etc/tasks/001-openssl.sh
+++ b/etc/pkgs/001-openssl.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 set -x
 
 name="openssl"
@@ -54,7 +53,7 @@ function build()
             zlib-dynamic \
             shared \
             no-ssl3-method
-        make
+        make -j${_maxjobs}
         make install MANDIR="${prefix}/share/man" MANSUFFIX=ssl
     popd
     post
@@ -64,6 +63,7 @@ function post()
 {
     bundle=$(get_system_cacert)
     install -D -m644 "${bundle}" "${prefix}/ssl/cert.pem"
+    rm -rf "${prefix}/share/doc/openssl/html"
     rm -rf "${dest}"
     rm -rf "${tarball}"
     echo "All done."
diff --git a/etc/tasks/002-python.sh b/etc/pkgs/002-python.sh
index d7db12f..36cebc6 100755
--- a/etc/tasks/002-python.sh
+++ b/etc/pkgs/002-python.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 set -x
 
 python_version="${PYTHON_VERSION}"
@@ -98,7 +97,7 @@ function build()
             --with-dbmliborder=gdbm:ndbm \
             --with-pymalloc \
             --with-system-expat
-        make -j4
+        make -j${_maxjobs}
         make install
     popd
     post
diff --git a/etc/tasks/004-packages.sh b/etc/tasks/001-packages.sh
index f7d0cad..5d20ee7 100755
--- a/etc/tasks/004-packages.sh
+++ b/etc/tasks/001-packages.sh
@@ -1,17 +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 PREFIX="${prefix}"
-
 function pre()
 {
     if [[ ! -d ${reqdir} ]]; then
@@ -30,6 +23,11 @@ function build()
     do
         chmod +x "${req}"
         "${req}"
+        retval=$?
+        if [[ ${retval} != 0 ]]; then
+            echo "BUILD FAILED: ${req}"
+            exit ${retval}
+        fi
     done
     post
 }
diff --git a/etc/tasks/003-python-packages.sh b/etc/tasks/002-python-packages.sh
index cb248ff..bcd0b6f 100755
--- a/etc/tasks/003-python-packages.sh
+++ b/etc/tasks/002-python-packages.sh
@@ -1,15 +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 CFLAGS="-I${prefix}/include"
-export LDFLAGS="-L${prefix}/lib -Wl,-rpath=${prefix}/lib"
-
 function pre()
 {
     if [[ ! -d ${reqdir} ]]; then
@@ -24,7 +18,12 @@ function build()
     # Iterate over pip requirement files
     for req in ${reqdir}/*
     do
-        pip install --upgrade --progress-bar=off -v -r "${req}"
+        pip install --upgrade --progress-bar=off -r "${req}"
+        retval=$?
+        if [[ ${retval} != 0 ]]; then
+            echo "BUILD FAILED: ${req}"
+            exit ${retval}
+        fi
     done
     post
 }
@@ -32,8 +31,8 @@ function build()
 function post()
 {
     rm -rf ~/.cache/pip
-    [[ -d src ]] && rm -rf src
-    [[ -f gmon.out ]] && rm -rf gmon.out
+    [[ -d src ]] && rm -rf src || true
+    [[ -f gmon.out ]] && rm -rf gmon.out || true
 }
 
 build
diff --git a/etc/tasks/999-clean.sh b/etc/tasks/999-clean.sh
index 44f5d16..e4e8d13 100755
--- a/etc/tasks/999-clean.sh
+++ b/etc/tasks/999-clean.sh
@@ -11,6 +11,9 @@ 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}"