diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-25 17:26:03 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-25 17:26:03 +0000 |
| commit | 2b85d0a1de9ec57aab6293163d9885d76a47035c (patch) | |
| tree | 1af88e8d048a80a938eeb2f2ef755afb1db0d367 /subr/pkg_configure_autotools.subr | |
| parent | 3c8c5672d623aa069082cc9aad5af13fdd69a97a (diff) | |
| download | midipix_build-2b85d0a1de9ec57aab6293163d9885d76a47035c.tar.bz2 midipix_build-2b85d0a1de9ec57aab6293163d9885d76a47035c.tar.xz | |
General cleanup, pt. I.
Diffstat (limited to 'subr/pkg_configure_autotools.subr')
| -rw-r--r-- | subr/pkg_configure_autotools.subr | 80 |
1 files changed, 34 insertions, 46 deletions
diff --git a/subr/pkg_configure_autotools.subr b/subr/pkg_configure_autotools.subr index 01f81ce5..7c1ee329 100644 --- a/subr/pkg_configure_autotools.subr +++ b/subr/pkg_configure_autotools.subr @@ -1,63 +1,51 @@ # -# set -o errexit -o noglob are assumed. +# set +o errexit -o noglob is assumed. # pkg_configure_autotools() { - local _script_fname="" _subdir_tgt=""; - if [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure" -o \ - -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" -o \ - -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.in" -o \ - -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/config.guess" ]; then - if [ -n "${PKG_PKG_CONFIG}" ]; then - export PKG_CONFIG="${PKG_PKG_CONFIG}"; - fi; - if [ -n "${PKG_PKG_CONFIG_PATH}" ]; then - export PKG_CONFIG_PATH="${PKG_PKG_CONFIG_PATH}"; - fi; + local _config_cache="" _fname="" _subdir_tgt=""; + if ex_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}"; if [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" ]\ && [ ! -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure" ]; then - for _script_fname in bootstrap bootstrap.sh autogen.sh ""; do - if [ -z "${_script_fname}" ]; then - (ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && autoconf)\ - || exit 1 && break; - elif [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/${_script_fname}" ]; then - for _subdir_tgt in "${PKG_BASE_DIR}/${PKG_SUBDIR}/build-aux" "${PKG_BASE_DIR}/${PKG_SUBDIR}"; do - if [ -e "${_subdir_tgt}" ]; then - echo install -m 0700 \ - "${MIDIPIX_BUILD_PWD}/etc/config.sub" \ - "${_subdir_tgt}/config.sub"; - install -m 0700 \ - "${MIDIPIX_BUILD_PWD}/etc/config.sub" \ - "${_subdir_tgt}/config.sub"; - break; + for _fname in bootstrap bootstrap.sh autogen.sh; do + if [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/${_fname}" ]; then + for _subdir_tgt in \ + "${PKG_BASE_DIR}/${PKG_SUBDIR}/build-aux" \ + "${PKG_BASE_DIR}/${PKG_SUBDIR}"; + do if [ -e "${_subdir_tgt}" ]; then + ex_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}" && \ - /bin/sh "${_script_fname}") || exit 1 && break; + (ex_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 "${?}"; fi; - find "${PKG_BASE_DIR}/${PKG_SUBDIR}" -name config.sub \ - -exec echo mv -- {} {}.orig \; \ - -exec mv -- {} {}.orig \; \ - -exec echo install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \; \ - -exec install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;; + 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 + return 1; + fi; + done if [ "${PKG_BUILD_TYPE}" != host ]; then - if [ -n "${PKG_CONFIG_CACHE}" ]; then - echo "${PKG_CONFIG_CACHE}" |\ - tr " " "\n" > "${PKG_BUILD_DIR}/config.cache"; - if [ -n "${PKG_CONFIG_CACHE_LOCAL}" ]; then - echo "${PKG_CONFIG_CACHE_LOCAL}" |\ - tr " " "\n" >> "${PKG_BUILD_DIR}/config.cache"; - fi; - if [ -n "${PKG_CONFIG_CACHE_EXTRA}" ]; then - echo "${PKG_CONFIG_CACHE_EXTRA}" |\ - tr " " "\n" >> "${PKG_BUILD_DIR}/config.cache"; - fi; + if ! ex_rtl_fileop touch "${PKG_BUILD_DIR}/config.cache"; then + return 1; + else for _config_cache in \ + "${PKG_CONFIG_CACHE}" \ + "${PKG_CONFIG_CACHE_LOCAL}" \ + "${PKG_CONFIG_CACHE_EXTRA}"; + do echo "${_config_cache}" |\ + tr " " "\n" >> "${PKG_BUILD_DIR}/config.cache" || return "${?}"; + done; + sed -i"" "s,%PREFIX%,${PKG_PREFIX},g" "${PKG_BUILD_DIR}/config.cache" || return "${?}"; fi; - sed -i"" "s,%PREFIX%,${PKG_PREFIX},g" "${PKG_BUILD_DIR}/config.cache"; fi; - unset PKG_CONFIG PKG_CONFIG_PATH; + ex_rtl_export_vars -u PKG_CONFIG "${PKG_PKG_CONFIG}" PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH}"; fi; }; |