subr/*: reorganised as {ex{,_{pkg,rtl,setup}},pkg}_*.

1 files changed, 48 insertions, 48 deletions

diff --git a/vars/gcc.vars b/vars/gcc.vars
index 5391aeec..277ba8a8 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -39,9 +39,9 @@ pkgp_gcc_setup_env() {
 };
 
 pkgp_gcc_configure() {
-	build_fileop rm "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
-	build_fileop mkdir "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
-	build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	ex_build_fileop rm "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	ex_build_fileop mkdir "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	ex_build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	"../cbb-gcc-${PKG_GCC_VERSION}/configure" "${@}"\
 		--disable-bootstrap			\
 		--disable-libmudflap			\
@@ -64,7 +64,7 @@ pkgp_gcc_configure() {
 		--enable-threads=posix			\
 		--target="${PKG_TARGET}"		\
 		--with-fpmath=sse;
-	set_build_script_done "${PKG_NAME}" configure -build;
+	ex_pkg_state_push "${PKG_NAME}" configure -build;
 };
 
 pkg_gcc_stage1_cross_x86_64_w64_mingw32_all() {
@@ -84,33 +84,33 @@ pkg_gcc_stage1_all() {
 	case "${PKG_NAME}" in
 	gcc_stage1)
 		PKG_GCC_VERSION="${PKG_GCC_STAGE1_VERSION}";
-		set_build_dir "cbb-gcc-${PKG_GCC_VERSION}" cross;
+		ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_VERSION}" cross;
 		;;
 	gcc_stage1_cross_x86_64_w64_mingw32)
 		PKG_GCC_VERSION="${PKG_GCC_STAGE1_CROSS_X86_64_W64_MINGW32_VERSION}";
-		set_build_dir "cbb-gcc-${PKG_GCC_VERSION}" cross;
+		ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_VERSION}" cross;
 		;;
 	gcc_stage1_native_x86_64_w64_mingw32)
 		PKG_GCC_VERSION="${PKG_GCC_STAGE1_NATIVE_X86_64_W64_MINGW32_VERSION}";
-		set_build_dir "cbb-gcc-${PKG_GCC_VERSION}" native;
+		ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_VERSION}" native;
 		;;
 	esac;
 	# GCC, stage1.
-	if ! is_build_script_done "${PKG_NAME}" fetch "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
 		pkg_fetch_git "cbb-gcc-${PKG_GCC_VERSION}=${DEFAULT_GITROOT}/cbb/cbb-gcc-${PKG_GCC_VERSION}";
-		set_build_script_done "${PKG_NAME}" fetch -patch;
+		ex_pkg_state_push "${PKG_NAME}" fetch -patch;
 	fi;
-	if ! is_build_script_done "${PKG_NAME}" patch "${_restart_at}"; then
+	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";
 		fi;
-		set_build_script_done "${PKG_NAME}" patch -configure;
+		ex_pkg_state_push "${PKG_NAME}" patch -configure;
 	fi;
 	pkgp_gcc_setup_env "${PKG_GCC_VERSION}";
-	if ! is_build_script_done "${PKG_NAME}" configure "${_restart_at}"; then
-		build_fileop mkdir "${PKG_PREFIX}/include";
+	if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
+		ex_build_fileop mkdir "${PKG_PREFIX}/include";
 		[ \! -d "${PKG_PREFIX}/usr" ] &&			\
-			build_fileop ln_symbolic . "${PKG_PREFIX}/usr";
+			ex_build_fileop ln_symbolic . "${PKG_PREFIX}/usr";
 		case "${PKG_NAME}" in
 		gcc_stage1)
 			pkgp_gcc_configure				\
@@ -137,13 +137,13 @@ pkg_gcc_stage1_all() {
 				--without-headers; ;;
 		esac;
 	else
-		build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+		ex_build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	fi;
-	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} all-gcc;
-		set_build_script_done "${PKG_NAME}" build -install;
+		ex_pkg_state_push "${PKG_NAME}" build -install;
 	fi;
-	if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 		case "${PKG_NAME}" in
 		gcc_stage1)
 			make ${PKG_MAKEFLAGS_BUILD} install-gcc; ;;
@@ -154,10 +154,10 @@ pkg_gcc_stage1_all() {
 		esac;
 		__="$(uname -s)";
 		if [ "${__#*CYGWIN*}" != "${__}" ]; then
-			build_fileop ln_symbolic "${PREFIX}/libexec/gcc/${PKG_TARGET}/${PKG_GCC_VERSION}/liblto_plugin.dll.a"	\
-				build_fileop ln_symbolic "${PREFIX}/libexec/gcc/${PKG_TARGET}/${PKG_GCC_VERSION}/liblto_plugin.so";
+			ex_build_fileop ln_symbolic "${PREFIX}/libexec/gcc/${PKG_TARGET}/${PKG_GCC_VERSION}/liblto_plugin.dll.a"	\
+				ex_build_fileop ln_symbolic "${PREFIX}/libexec/gcc/${PKG_TARGET}/${PKG_GCC_VERSION}/liblto_plugin.so";
 		fi;
-		set_build_script_done "${PKG_NAME}" install finish;
+		ex_pkg_state_push "${PKG_NAME}" install finish;
 	fi;
 	exit 0;
 };
@@ -165,16 +165,16 @@ pkg_gcc_stage1_all() {
 pkg_gcc_runtime_all() {
 	local _restart_at="${1}";
 	export MAKE="make LIBTOOL=slibtool";
-	set_build_dir "cbb-gcc-${PKG_GCC_RUNTIME_VERSION}" cross;
-	build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_RUNTIME_VERSION}" cross;
+	ex_build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	# GCC, compiler runtime.
-	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} all-target-libgcc;
-		set_build_script_done "${PKG_NAME}" build -install;
+		ex_pkg_state_push "${PKG_NAME}" build -install;
 	fi;
-	if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} install-target-libgcc;
-		set_build_script_done "${PKG_NAME}" install finish;
+		ex_pkg_state_push "${PKG_NAME}" install finish;
 	fi;
 	exit 0;
 };
@@ -182,16 +182,16 @@ pkg_gcc_runtime_all() {
 pkg_gcc_libstdcpp_v3_all() {
 	local _restart_at="${1}";
 	export MAKE="make LIBTOOL=slibtool";
-	set_build_dir "cbb-gcc-${PKG_GCC_LIBSTDCPP_V3_VERSION}" cross;
-	build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_LIBSTDCPP_V3_VERSION}" cross;
+	ex_build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	# GCC, libstdc++-v3.
-	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} all-target-libstdc++-v3;
-		set_build_script_done "${PKG_NAME}" build -install;
+		ex_pkg_state_push "${PKG_NAME}" build -install;
 	fi;
-	if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} install-target-libstdc++-v3;
-		set_build_script_done "${PKG_NAME}" install finish;
+		ex_pkg_state_push "${PKG_NAME}" install finish;
 	fi;
 	exit 0;
 };
@@ -199,16 +199,16 @@ pkg_gcc_libstdcpp_v3_all() {
 pkg_gcc_full_all() {
 	local _restart_at="${1}";
 	export MAKE="make LIBTOOL=slibtool";
-	set_build_dir "cbb-gcc-${PKG_GCC_FULL_VERSION}" cross;
-	build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_FULL_VERSION}" cross;
+	ex_build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	# GCC, everything else.
-	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD};
-		set_build_script_done "${PKG_NAME}" build -install;
+		ex_pkg_state_push "${PKG_NAME}" build -install;
 	fi;
-	if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} install;
-		set_build_script_done "${PKG_NAME}" install finish;
+		ex_pkg_state_push "${PKG_NAME}" install finish;
 	fi;
 	exit 0;
 };
@@ -218,12 +218,12 @@ pkg_gcc_native_all() {
 	PKG_GCC_VERSION="${PKG_GCC_NATIVE_VERSION}";
 	export MAKE="make LIBTOOL=slibtool";
 	# GCC, native.
-	set_build_dir "cbb-gcc-${PKG_GCC_VERSION}" native;
+	ex_pkg_state_build_dir "cbb-gcc-${PKG_GCC_VERSION}" native;
 	pkgp_gcc_setup_env "${PKG_GCC_VERSION}";
-	if ! is_build_script_done "${PKG_NAME}" configure "${_restart_at}"; then
-		build_fileop mkdir "${PKG_PREFIX}/${PKG_TARGET}";
+	if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
+		ex_build_fileop mkdir "${PKG_PREFIX}/${PKG_TARGET}";
 		if [ \! -d "${PKG_PREFIX}/${PKG_TARGET}/usr" ]; then
-			build_fileop ln_symbolic . "${PKG_PREFIX}/${PKG_TARGET}/usr";
+			ex_build_fileop ln_symbolic . "${PKG_PREFIX}/${PKG_TARGET}/usr";
 		fi;
 		if [ "${ARCH}" = nt32 ]; then
 			_configure_host="i686-nt32-midipix";
@@ -240,18 +240,18 @@ pkg_gcc_native_all() {
 			--with-mpfr="${PKG_PREFIX}"		\
 			--with-sysroot=;
 	else
-		build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+		ex_build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	fi;
-	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} all-gcc;
 		make ${PKG_MAKEFLAGS_BUILD} all-target-libgcc;
 		make ${PKG_MAKEFLAGS_BUILD} all-target-libstdc++-v3;
 		make ${PKG_MAKEFLAGS_BUILD} all;
-		set_build_script_done "${PKG_NAME}" build -install;
+		ex_pkg_state_push "${PKG_NAME}" build -install;
 	fi;
-	if ! is_build_script_done "${PKG_NAME}" install "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} "DESTDIR=${PKG_PREFIX}" install;
-		set_build_script_done "${PKG_NAME}" install finish;
+		ex_pkg_state_push "${PKG_NAME}" install finish;
 	fi;
 	exit 0;
 };