diff options
author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-22 18:31:27 +0000 |
---|---|---|
committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-22 18:38:54 +0000 |
commit | d18b1a13558fd4c78372fe610e7f6391f9eae874 (patch) | |
tree | b1525c7ea9060ae50f6ef3aafcfe398bf2dd7083 /subr/ex_pkg_env.subr | |
parent | fc9417f077a909539495531229f9035c15fe10f0 (diff) | |
download | midipix_build-d18b1a13558fd4c78372fe610e7f6391f9eae874.tar.bz2 midipix_build-d18b1a13558fd4c78372fe610e7f6391f9eae874.tar.xz |
subr/ex_pkg_{dispatch,steps}.subr: split.
subr/ex_pkg_{env,vars}.subr: moved checks.
Diffstat (limited to 'subr/ex_pkg_env.subr')
-rw-r--r-- | subr/ex_pkg_env.subr | 99 |
1 files changed, 56 insertions, 43 deletions
diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr index b3ea764c..a3310797 100644 --- a/subr/ex_pkg_env.subr +++ b/subr/ex_pkg_env.subr @@ -4,50 +4,63 @@ ex_pkg_env() { local _vname; - [ -z "${MIDIPIX_BUILD_PWD}" ] && MIDIPIX_BUILD_PWD="$(pwd)"; - [ -z "${PKG_FNAME}" ] && PKG_FNAME="${PKG_URL##*/}"; - [ -z "${PKG_TARGET}" ] && PKG_TARGET="${TARGET}"; - case "${PKG_BASE_DIR}" in - ?*) ;; - *) PKG_BASE_DIR="${WORKDIR}/${PKG_NAME}-${PKG_BUILD_TYPE:-native}-${PKG_TARGET}"; - if [ -n "${ARG_RESTART}" ]\ - && [ -z "${ARG_RESTART_AT}" ]; then - ex_build_fileop rm "${PKG_BASE_DIR}"; - fi; ;; - esac; - PKG_DESTDIR="${PKG_BASE_DIR}/destdir"; - case "${PKG_BUILD_TYPE}" in - host) export AR="ar"; - export CC="gcc"; - export CXX="g++"; - export RANLIB="ranlib"; ;; - *) export AR="${PKG_TARGET}-ar"; - export CC="${PKG_TARGET}-gcc"; - export CXX="${PKG_TARGET}-g++"; - export RANLIB="${PKG_TARGET}-ranlib"; - [ -x "${PREFIX}/bin/${TARGET}-pkg-config" ]\ - && export PKG_CONFIG="${PREFIX}/bin/${TARGET}-pkg-config"; - ;; - esac; - export LIBTOOL="${PKG_SLIBTOOL:-slibtool}"; - export MAKE="make LIBTOOL=${PKG_SLIBTOOL:-slibtool}"; - case "${PKG_SUBDIR}" in - ?*) ;; - *) case "${PKG_URLS_GIT}" in - ?*) PKG_SUBDIR="${PKG_URLS_GIT%%=*}"; ;; - *) case "${PKG_FNAME}" in - *.t*) PKG_SUBDIR="${PKG_FNAME%%.t*}"; ;; - *) PKG_SUBDIR="${PKG_NAME}"; ;; + if [ -z "${PKG_URL}" ]\ + && [ -z "${PKG_URLS_GIT}" ]\ + && [ -z "${PKG_VERSION}" ]\ + && ! ex_test_cmd "pkg_${PKG_NAME}_all"; then + ex_log_msg failexit "Error: package \`${PKG_NAME}' missing in build.vars."; + return 1; + elif [ "${PKG_DISABLED:-0}" -eq 1 ]; then + ex_log_msg vnfo "Skipping disabled package \`${PKG_NAME}.'"; + return 0; + else + [ -z "${MIDIPIX_BUILD_PWD}" ] && MIDIPIX_BUILD_PWD="$(pwd)"; + [ -z "${PKG_FNAME}" ] && PKG_FNAME="${PKG_URL##*/}"; + [ -z "${PKG_TARGET}" ] && PKG_TARGET="${TARGET}"; + case "${PKG_BASE_DIR}" in + ?*) ;; + *) PKG_BASE_DIR="${WORKDIR}/${PKG_NAME}-${PKG_BUILD_TYPE:-native}-${PKG_TARGET}"; + if [ -n "${ARG_RESTART}" ]\ + && [ -z "${ARG_RESTART_AT}" ]; then + ex_build_fileop rm "${PKG_BASE_DIR}"; + fi; ;; + esac; + ex_build_fileop mkdir "${PKG_BASE_DIR}"; + ex_build_fileop cd "${PKG_BASE_DIR}"; + PKG_DESTDIR="${PKG_BASE_DIR}/destdir"; + case "${PKG_BUILD_TYPE}" in + host) export AR="ar"; + export CC="gcc"; + export CXX="g++"; + export RANLIB="ranlib"; ;; + *) export AR="${PKG_TARGET}-ar"; + export CC="${PKG_TARGET}-gcc"; + export CXX="${PKG_TARGET}-g++"; + export RANLIB="${PKG_TARGET}-ranlib"; + [ -x "${PREFIX}/bin/${TARGET}-pkg-config" ]\ + && export PKG_CONFIG="${PREFIX}/bin/${TARGET}-pkg-config"; + ;; + esac; + export LIBTOOL="${PKG_SLIBTOOL:-slibtool}"; + export MAKE="make LIBTOOL=${PKG_SLIBTOOL:-slibtool}"; + case "${PKG_SUBDIR}" in + ?*) ;; + *) case "${PKG_URLS_GIT}" in + ?*) PKG_SUBDIR="${PKG_URLS_GIT%%=*}"; ;; + *) case "${PKG_FNAME}" in + *.t*) PKG_SUBDIR="${PKG_FNAME%%.t*}"; ;; + *) PKG_SUBDIR="${PKG_NAME}"; ;; + esac; ;; esac; ;; - esac; ;; - esac; - for _vname in $(ex_split : ${PKG_ENV_VARS_EXTRA}); do - export "${_vname}"; - done; - if [ -n "${PKG_ENV_VARS}" ]\ - && [ "${PKG_NO_LOG_VARS:-0}" -eq 0 ]; then - PKG_ENV_VARS="$(echo "${PKG_ENV_VARS}" | tr " " "\n" | sort | tr "\n" " ")"; - ex_log_env_vars "build" ${PKG_ENV_VARS}; + esac; + for _vname in $(ex_split : ${PKG_ENV_VARS_EXTRA}); do + export "${_vname}"; + done; + if [ -n "${PKG_ENV_VARS}" ]\ + && [ "${PKG_NO_LOG_VARS:-0}" -eq 0 ]; then + PKG_ENV_VARS="$(echo "${PKG_ENV_VARS}" | tr " " "\n" | sort | tr "\n" " ")"; + ex_log_env_vars "build" ${PKG_ENV_VARS}; + fi; fi; }; |