From 50119cd3346fb4049325184360e5db03d7030581 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Wed, 4 Mar 2020 16:10:24 -0500
Subject: Oh the multilib is killing me

---
 scripts/spmbuild | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'scripts/spmbuild')

diff --git a/scripts/spmbuild b/scripts/spmbuild
index c600703..01ba947 100755
--- a/scripts/spmbuild
+++ b/scripts/spmbuild
@@ -158,13 +158,17 @@ function spm_build_initialize_stage2() {
 
 function spm_build_cleanup() {
     #:
+    if [[ ${keep} != 0 ]]; then
+        echo "Temporary storage not destroyed"
+        return
+    fi
     [[ -d ${SPM_BUILD_ROOT_BASE} ]] && rm -rf ${SPM_BUILD_ROOT_BASE}
     [[ -d ${SPM_BUILD_RUNTIME_BASE} ]] && rm -rf ${SPM_BUILD_RUNTIME_BASE}
     [[ -d ${SPM_BUILD_PKGDIR_BASE} ]] && rm -rf ${SPM_BUILD_PKGDIR_BASE}
 }
 
 function spm_build_install() {
-    ${SPM} --yes --override-manifests --manifest "${SPM_BUILD_STORE_PACKAGES}" --install $@ --root "${SPM_BUILD_RUNTIME}"
+    ${SPM} --verbose --yes --override-manifests --manifest "${SPM_BUILD_STORE_PACKAGES}" --install $@ --root "${SPM_BUILD_RUNTIME}"
 }
 
 function spm_build_mkprefixbin() {
@@ -336,6 +340,7 @@ function spm_build_do_stage_archive() {
 }
 
 # -- main --
+export keep=${keep:-0}
 export SPM_BUILD_SCRIPT="build.sh"
 export SPM_BUILD_SCRIPT_ROOT="$1"
 
@@ -362,6 +367,8 @@ package_final="${package_target}/${package_archive}"
 
 if [[ ! -d "${package_target}" ]]; then
     mkdir -p ${package_target}
+    spm_build_mkmanifest "${package_target}" "${package_target}"
+
 fi
 
 msg2 "Downloading source files..."
-- 
cgit