summaryrefslogtreecommitdiffhomepage
path: root/vars
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2021-05-07 17:12:29 +0100
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2021-05-07 17:12:29 +0100
commit370e98db644d9cd75172205e4e472978e68e0990 (patch)
tree28c009461e87ea94ebad5ad55c48e1cbdd74a63b /vars
parent9d255dd37a449f7661fd8a73f58ea6102269851d (diff)
downloadmidipix_build-370e98db644d9cd75172205e4e472978e68e0990.tar.bz2
midipix_build-370e98db644d9cd75172205e4e472978e68e0990.tar.xz
Implements extended -r syntax.
build.sh:buildp_ast(): only reset package build step state if ${ARG_RESET_PKG} is 1. etc/{build.usage,README.md}: updated. etc/build.usage.short, subr/build_init.subr: implement short help screen. midipix.env: correctly escape multi-line variable assignment expressions. subr.rtl/rtl_list.subr: updated. subr.rtl/rtl_state.subr:rtl_state_set(): correctly implement invalidation. subr.rtl/rtl_state.subr:rtl_state_test(): honour `LAST'. subr/build_init.subr:buildp_init_getopts(): implements --reset-pkg. subr/build_init.subr:buildp_{expand_restart_{at,recursive},process_restart_spec}(): initial implementation. subr/ex_pkg_{dispatch,env}.subr: updated. subr/ex_pkg_exec.subr:ex_pkg_exec(): honour `ALL' and `LAST'. vars/gcc.vars: updated.
Diffstat (limited to 'vars')
-rw-r--r--vars/gcc.vars44
1 files changed, 22 insertions, 22 deletions
diff --git a/vars/gcc.vars b/vars/gcc.vars
index 50794c93..6aa9cb39 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}";
};
pkgp_gcc_configure() {
@@ -41,7 +41,7 @@ pkgp_gcc_configure() {
--with-fpmath=sse; then
return 1;
else
- pkgp_gcc_state_set "configure" -"build";
+ pkgp_gcc_state_set "configure" "build";
fi;
};
@@ -130,14 +130,14 @@ pkgp_gcc_stage1_all() {
"cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}"; then
return 1;
else
- pkgp_gcc_state_set "fetch" -"patch";
+ pkgp_gcc_state_set "fetch" "patch";
fi;
fi;
if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
if [ -e "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" ]; then
patch -b -d "${PKG_BASE_DIR}" -p0 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" || return 1;
fi;
- pkgp_gcc_state_set "patch" -"configure";
+ pkgp_gcc_state_set "patch" "configure";
fi;
pkgp_gcc_setup_vars; pkgp_gcc_setup_env;
if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
@@ -179,11 +179,11 @@ pkgp_gcc_stage1_all() {
fi;
if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
make ${PKG_MAKEFLAGS_BUILD} "all-gcc" || return 1;
- pkgp_gcc_state_set "build" -"install_subdirs";
+ pkgp_gcc_state_set "build" "install_subdirs";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
pkg_install_subdirs || return 1;
- pkgp_gcc_state_set "install_subdirs" -"install_make";
+ pkgp_gcc_state_set "install_subdirs" "install_make";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
case "${PKG_NAME}" in
@@ -203,12 +203,12 @@ pkgp_gcc_stage1_all() {
return 1;
fi; ;;
esac;
- pkgp_gcc_state_set "install_make" -"install";
+ pkgp_gcc_state_set "install_make" "install";
fi;
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" "finish";
fi;
};
@@ -227,14 +227,14 @@ pkg_gcc_full_all() {
"cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}"; then
return 1;
else
- pkgp_gcc_state_set "fetch" -"patch";
+ pkgp_gcc_state_set "fetch" "patch";
fi;
fi;
if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
if [ -e "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" ]; then
patch -b -d "${PKG_BASE_DIR}" -p0 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" || return 1;
fi;
- pkgp_gcc_state_set "patch" -"configure";
+ pkgp_gcc_state_set "patch" "configure";
fi;
pkgp_gcc_setup_vars; pkgp_gcc_setup_env;
if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
@@ -264,16 +264,16 @@ pkg_gcc_full_all() {
|| ! make ${PKG_MAKEFLAGS_BUILD} "all-target-libgfortran"\
|| ! make ${PKG_MAKEFLAGS_BUILD} "all"; then
return 1;
- else pkgp_gcc_state_set "build" -"install_subdirs";
+ else pkgp_gcc_state_set "build" "install_subdirs";
fi;
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
pkg_install_subdirs || return 1;
- pkgp_gcc_state_set "install_subdirs" -"install_make";
+ pkgp_gcc_state_set "install_subdirs" "install_make";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install" || return 1;
- pkgp_gcc_state_set "install_make" -"install";
+ 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";
@@ -288,15 +288,15 @@ pkg_gcc_full_host_all() {
return 1;
else if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
make ${PKG_MAKEFLAGS_BUILD} || return 1;
- pkgp_gcc_state_set "build" -"install_subdirs";
+ pkgp_gcc_state_set "build" "install_subdirs";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
pkg_install_subdirs || return 1;
- pkgp_gcc_state_set "install_subdirs" -"install_make";
+ pkgp_gcc_state_set "install_subdirs" "install_make";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install" || return 1;
- pkgp_gcc_state_set "install_make" -"install";
+ pkgp_gcc_state_set "install_make" "install";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
pkg_install || return 1;
@@ -313,15 +313,15 @@ pkg_gcc_libstdcpp_v3_host_all() {
return 1;
else if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
make ${PKG_MAKEFLAGS_BUILD} "all-target-libstdc++-v3" || return 1;
- pkgp_gcc_state_set "build" -"install_subdirs";
+ pkgp_gcc_state_set "build" "install_subdirs";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
pkg_install_subdirs || return 1;
- pkgp_gcc_state_set "install_subdirs" -"install_make";
+ pkgp_gcc_state_set "install_subdirs" "install_make";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-target-libstdc++-v3" || return 1;
- pkgp_gcc_state_set "install_make" -"install";
+ pkgp_gcc_state_set "install_make" "install";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
pkg_install || return 1;
@@ -338,15 +338,15 @@ pkg_gcc_runtime_host_all() {
return 1;
else if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
make ${PKG_MAKEFLAGS_BUILD} "all-target-libgcc" ${_vis_hide} || return 1;
- pkgp_gcc_state_set "build" -"install_subdirs";
+ pkgp_gcc_state_set "build" "install_subdirs";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
pkg_install_subdirs || return 1;
- pkgp_gcc_state_set "install_subdirs" -"install_make";
+ pkgp_gcc_state_set "install_subdirs" "install_make";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" "install-target-libgcc" || return 1;
- pkgp_gcc_state_set "install_make" -"install";
+ pkgp_gcc_state_set "install_make" "install";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
pkg_install || return 1;