General cleanup, pt. II.

1 files changed, 24 insertions, 24 deletions

diff --git a/vars/gcc.vars b/vars/gcc.vars
index 61675322..ec22fe62 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -61,9 +61,9 @@ pkgp_gcc_setup_env() {
 };
 
 pkgp_gcc_configure() {
-	ex_rtl_fileop rm "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
-	ex_rtl_fileop mkdir "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
-	ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	rtl_fileop rm "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	rtl_fileop mkdir "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	"../cbb-gcc-${PKG_VERSION}/configure" "${@}"\
 		--disable-bootstrap			\
 		--disable-libmudflap			\
@@ -94,18 +94,18 @@ pkg_gcc_stage1_host_all() {
 };
 
 pkg_gcc_stage1_cross_mingw32_all() {
-	ex_rtl_fileop ln_symbolic . "${PKG_PREFIX}/x86_64-w64-mingw32/mingw";
-	ex_rtl_fileop mkdir "${PKG_DESTDIR}/x86_64-w64-mingw32";
-	ex_rtl_fileop ln_symbolic . "${PKG_DESTDIR}/x86_64-w64-mingw32/mingw";
-	ex_rtl_fileop mkdir "${PKG_PREFIX}/x86_64-w64-mingw32/include";
+	rtl_fileop ln_symbolic . "${PKG_PREFIX}/x86_64-w64-mingw32/mingw";
+	rtl_fileop mkdir "${PKG_DESTDIR}/x86_64-w64-mingw32";
+	rtl_fileop ln_symbolic . "${PKG_DESTDIR}/x86_64-w64-mingw32/mingw";
+	rtl_fileop mkdir "${PKG_PREFIX}/x86_64-w64-mingw32/include";
 	pkg_gcc_stage1_all "${@}";
 };
 
 pkg_gcc_stage1_native_mingw32_all() {
-	ex_rtl_fileop ln_symbolic . "${PKG_PREFIX}/x86_64-w64-mingw32/mingw";
-	ex_rtl_fileop mkdir "${PKG_DESTDIR}/x86_64-w64-mingw32";
-	ex_rtl_fileop ln_symbolic . "${PKG_DESTDIR}/x86_64-w64-mingw32/mingw";
-	ex_rtl_fileop mkdir "${PKG_PREFIX}/x86_64-w64-mingw32/include";
+	rtl_fileop ln_symbolic . "${PKG_PREFIX}/x86_64-w64-mingw32/mingw";
+	rtl_fileop mkdir "${PKG_DESTDIR}/x86_64-w64-mingw32";
+	rtl_fileop ln_symbolic . "${PKG_DESTDIR}/x86_64-w64-mingw32/mingw";
+	rtl_fileop mkdir "${PKG_PREFIX}/x86_64-w64-mingw32/include";
 	pkg_gcc_stage1_all "${@}";
 };
 
@@ -113,8 +113,8 @@ pkg_gcc_stage1_all() {
 	local __="" _restart_at="${1}";
 	case "${PKG_NAME}" in
 	gcc_stage1_host)
-		ex_rtl_fileop ln_symbolic . "${PREFIX_CROSS}/usr";
-		ex_rtl_fileop mkdir "${PREFIX_CROSS}/usr/include";
+		rtl_fileop ln_symbolic . "${PREFIX_CROSS}/usr";
+		rtl_fileop mkdir "${PREFIX_CROSS}/usr/include";
 		pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross;
 		;;
 	gcc_stage1_cross_mingw32)
@@ -126,7 +126,7 @@ pkg_gcc_stage1_all() {
 	esac;
 	# GCC, stage1.
 	if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
-		ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
+		rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
 		pkgp_gcc_state_set fetch patch;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
@@ -169,7 +169,7 @@ pkg_gcc_stage1_all() {
 				--without-headers; ;;
 		esac;
 	else
-		ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+		rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} all-gcc;
@@ -190,8 +190,8 @@ pkg_gcc_stage1_all() {
 		esac;
 		__="$(uname -s)";
 		if [ "${__#*CYGWIN*}" != "${__}" ]; then
-			ex_rtl_fileop ln_symbolic "${PKG_DESTDIR}/libexec/gcc/${PKG_TARGET}/${PKG_VERSION}/liblto_plugin.dll.a"	\
-				ex_rtl_fileop ln_symbolic "${PKG_DESTDIR}/libexec/gcc/${PKG_TARGET}/${PKG_VERSION}/liblto_plugin.so";
+			rtl_fileop ln_symbolic "${PKG_DESTDIR}/libexec/gcc/${PKG_TARGET}/${PKG_VERSION}/liblto_plugin.dll.a"	\
+				rtl_fileop ln_symbolic "${PKG_DESTDIR}/libexec/gcc/${PKG_TARGET}/${PKG_VERSION}/liblto_plugin.so";
 		fi;
 		pkgp_gcc_state_set install_make install;
 	fi;
@@ -206,7 +206,7 @@ pkg_gcc_runtime_host_all() {
 	local _vis_hide="vis_hide=-fvisibility=hidden";
 	export MAKE="make LIBTOOL=slibtool ${_vis_hide}";
 	pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross;
-	ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	# GCC, compiler runtime.
 	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} all-target-libgcc ${_vis_hide};
@@ -230,7 +230,7 @@ pkg_gcc_libstdcpp_v3_host_all() {
 	local _restart_at="${1}";
 	export MAKE="make LIBTOOL=slibtool";
 	pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross;
-	ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	# GCC, libstdc++-v3.
 	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} all-target-libstdc++-v3;
@@ -254,7 +254,7 @@ pkg_gcc_full_host_all() {
 	local _restart_at="${1}";
 	export MAKE="make LIBTOOL=slibtool";
 	pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross;
-	ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	# GCC, everything else.
 	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD};
@@ -281,7 +281,7 @@ pkg_gcc_full_all() {
 	# GCC, native.
 	pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" native;
 	if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
-		ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
+		rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
 		pkgp_gcc_state_set fetch patch;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
@@ -292,9 +292,9 @@ pkg_gcc_full_all() {
 	fi;
 	pkgp_gcc_setup_env "${PKG_VERSION}";
 	if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
-		ex_rtl_fileop mkdir "${PKG_PREFIX}/${PKG_TARGET}";
+		rtl_fileop mkdir "${PKG_PREFIX}/${PKG_TARGET}";
 		if [ \! -d "${PKG_PREFIX}/${PKG_TARGET}/usr" ]; then
-			ex_rtl_fileop ln_symbolic . "${PKG_PREFIX}/${PKG_TARGET}/usr";
+			rtl_fileop ln_symbolic . "${PKG_PREFIX}/${PKG_TARGET}/usr";
 		fi;
 		if [ "${ARCH}" = nt32 ]; then
 			_configure_host="i686-nt32-midipix";
@@ -311,7 +311,7 @@ pkg_gcc_full_all() {
 			--with-mpfr="${PKG_PREFIX}"		\
 			--with-sysroot=;
 	else
-		ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+		rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} all-gcc;