summaryrefslogtreecommitdiffhomepage
path: root/vars
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2021-05-11 18:24:52 +0100
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2021-05-11 18:24:52 +0100
commitf3f7e837f6c5732dbae54ef25727ee46c1501301 (patch)
treeb5faa0a35b2f71588321d6a11456c1b7fbf5603b /vars
parent00331b09b0a7a237c0542fb528609765747ad066 (diff)
downloadmidipix_build-f3f7e837f6c5732dbae54ef25727ee46c1501301.tar.bz2
midipix_build-f3f7e837f6c5732dbae54ef25727ee46c1501301.tar.xz
vars/gcc.vars: correctly set finish build step state.
Diffstat (limited to 'vars')
-rw-r--r--vars/gcc.vars18
1 files changed, 12 insertions, 6 deletions
diff --git a/vars/gcc.vars b/vars/gcc.vars
index 6aa9cb39..388b7adc 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -10,7 +10,7 @@
pkgp_gcc_build_dir() { PKG_BUILD_DIR="${1}-${2}-${PKG_TARGET}"; };
pkgp_gcc_state_set() {
printf "step unknown %s %s\n" "${PKG_NAME}" "${1}" >&3;
- ex_pkg_state_set "${PKG_NAME}" "${1}" "${2}";
+ ex_pkg_state_set "${PKG_NAME}" "${1}" ${2:+"${2}"};
};
pkgp_gcc_configure() {
@@ -208,8 +208,9 @@ pkgp_gcc_stage1_all() {
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
pkg_install || return 1;
- pkgp_gcc_state_set "install" "finish";
+ pkgp_gcc_state_set "install";
fi;
+ pkgp_gcc_state_set "finish";
};
@@ -276,8 +277,10 @@ pkg_gcc_full_all() {
pkgp_gcc_state_set "install_make" "install";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
- pkg_install || return 1; pkgp_gcc_state_set "install" "finish";
+ pkg_install || return 1;
+ pkgp_gcc_state_set "install";
fi;
+ pkgp_gcc_state_set "finish";
};
pkg_gcc_full_host_all() {
@@ -300,8 +303,9 @@ pkg_gcc_full_host_all() {
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
pkg_install || return 1;
- pkgp_gcc_state_set "install" "finish";
+ pkgp_gcc_state_set "install";
fi;
+ pkgp_gcc_state_set "finish";
fi;
};
@@ -325,8 +329,9 @@ pkg_gcc_libstdcpp_v3_host_all() {
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
pkg_install || return 1;
- pkgp_gcc_state_set "install" "finish";
+ pkgp_gcc_state_set "install";
fi;
+ pkgp_gcc_state_set "finish";
fi;
};
@@ -350,8 +355,9 @@ pkg_gcc_runtime_host_all() {
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
pkg_install || return 1;
- pkgp_gcc_state_set "install" "finish";
+ pkgp_gcc_state_set "install";
fi;
+ pkgp_gcc_state_set "finish";
fi;
};