diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-26 21:54:12 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-26 21:54:12 +0000 |
| commit | c6d6e08feab839a9dc5792071fb803494cc51a69 (patch) | |
| tree | 1513c817e4446ac3cf512d6c1f287a10fc1daf2e /subr/pkg_configure_autotools.subr | |
| parent | 4a5da5254e1207686f492e7ce8759c80466185f3 (diff) | |
| download | midipix_build-c6d6e08feab839a9dc5792071fb803494cc51a69.tar.bz2 midipix_build-c6d6e08feab839a9dc5792071fb803494cc51a69.tar.xz | |
General cleanup, pt. II.
Diffstat (limited to 'subr/pkg_configure_autotools.subr')
| -rw-r--r-- | subr/pkg_configure_autotools.subr | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/subr/pkg_configure_autotools.subr b/subr/pkg_configure_autotools.subr index 7c1ee329..bc3b6c23 100644 --- a/subr/pkg_configure_autotools.subr +++ b/subr/pkg_configure_autotools.subr @@ -4,9 +4,9 @@ pkg_configure_autotools() { local _config_cache="" _fname="" _subdir_tgt=""; - if ex_rtl_exists_any "${PKG_BASE_DIR}/${PKG_SUBDIR}" \ + if rtl_exists_any "${PKG_BASE_DIR}/${PKG_SUBDIR}" \ "config.guess" "configure.ac" "configure.in" "configure"; - then ex_rtl_export_vars PKG_CONFIG "${PKG_PKG_CONFIG}" PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH}"; + then rtl_export_vars PKG_CONFIG "${PKG_PKG_CONFIG}" PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH}"; if [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" ]\ && [ ! -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure" ]; then for _fname in bootstrap bootstrap.sh autogen.sh; do @@ -15,25 +15,25 @@ pkg_configure_autotools() { "${PKG_BASE_DIR}/${PKG_SUBDIR}/build-aux" \ "${PKG_BASE_DIR}/${PKG_SUBDIR}"; do if [ -e "${_subdir_tgt}" ]; then - ex_rtl_fileop install -m 0700 \ + rtl_fileop install -m 0700 \ "${MIDIPIX_BUILD_PWD}/etc/config.sub" \ "${_subdir_tgt}/config.sub" || return "${?}" && break; fi; done; - (ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && \ + (rtl_fileop cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && \ /bin/sh "${_fname}") || return "${?}" && break; fi; done; - (ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && autoconf) || return "${?}"; + (rtl_fileop cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && autoconf) || return "${?}"; fi; for _fname in $(find "${PKG_BASE_DIR}/${PKG_SUBDIR}" -name config.sub); do - if ! ex_rtl_fileop mv "${_fname}" "${_fname}.orig"\ - || ! ex_rtl_fileop install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" "${_fname}"; then + if ! rtl_fileop mv "${_fname}" "${_fname}.orig"\ + || ! rtl_fileop install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" "${_fname}"; then return 1; fi; done if [ "${PKG_BUILD_TYPE}" != host ]; then - if ! ex_rtl_fileop touch "${PKG_BUILD_DIR}/config.cache"; then + if ! rtl_fileop touch "${PKG_BUILD_DIR}/config.cache"; then return 1; else for _config_cache in \ "${PKG_CONFIG_CACHE}" \ @@ -45,7 +45,7 @@ pkg_configure_autotools() { sed -i"" "s,%PREFIX%,${PKG_PREFIX},g" "${PKG_BUILD_DIR}/config.cache" || return "${?}"; fi; fi; - ex_rtl_export_vars -u PKG_CONFIG "${PKG_PKG_CONFIG}" PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH}"; + rtl_export_vars -u PKG_CONFIG "${PKG_PKG_CONFIG}" PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH}"; fi; }; |