--- branches/magellan-next/include/multilib.sminc 2011/05/26 21:09:09 7554 +++ branches/magellan-next/include/multilib.sminc 2011/07/14 21:43:24 8334 @@ -1,6 +1,9 @@ # $Id$ # multilib abis +# be verbose or nor (true|false} +: ${MULTILIB_VERBOSE="true"} + # do not define EMUL_LINUX_32 after inherit of multlib !! # it may break i*86 builds @@ -69,27 +72,36 @@ local orig_pkg_config_path="${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}" - echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}" - echo -e "${COLBLUE}*** ${COLGREEN} ABI${COLDEFAULT}='${ABI}'" - echo -e "${COLBLUE}*** ${COLGREEN} CC${COLDEFAULT}='${CC}'" - echo -e "${COLBLUE}*** ${COLGREEN} CXX${COLDEFAULT}='${CXX}'" - echo -e "${COLBLUE}*** ${COLGREEN} ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'" - if [[ ${EXPORT_ABI_LDFLAGS} != false ]] + if [[ ${MULTILIB_VERBOSE} = true ]] then - echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${LDFLAGS}'" - else - echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'" + echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}" + echo -e "${COLBLUE}*** ${COLGREEN} ABI${COLDEFAULT}='${ABI}'" + echo -e "${COLBLUE}*** ${COLGREEN} CC${COLDEFAULT}='${CC}'" + echo -e "${COLBLUE}*** ${COLGREEN} CXX${COLDEFAULT}='${CXX}'" + echo -e "${COLBLUE}*** ${COLGREEN} ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'" + if [[ ${EXPORT_ABI_LDFLAGS} != false ]] + then + echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${LDFLAGS}'" + else + echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'" + fi + echo -e "${COLBLUE}*** ${COLGREEN} PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'" fi - echo -e "${COLBLUE}*** ${COLGREEN} PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'" # configure a linux32 emulated build if [[ ${EMUL_LINUX_32} = true ]] then - echo -e "${COLBLUE}*** ${COLGREEN} EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'" + if [[ ${MULTILIB_VERBOSE} = true ]] + then + echo -e "${COLBLUE}*** ${COLGREEN} EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'" + fi uname(){ linux32 uname $@; } && export -f uname ORIG_CHOST="${CHOST}" && export CHOST="i686-pc-linux-gnu" fi - echo -e "${COLBLUE}*** ${COLGREEN} CHOST${COLDEFAULT}='${CHOST}'" + if [[ ${MULTILIB_VERBOSE} = true ]] + then + echo -e "${COLBLUE}*** ${COLGREEN} CHOST${COLDEFAULT}='${CHOST}'" + fi # run any given command eval $@ || die @@ -120,19 +132,22 @@ local orig_pkg_config_path="${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}" - echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}" - echo -e "${COLBLUE}*** ${COLGREEN} ABI${COLDEFAULT}='${ABI}'" - echo -e "${COLBLUE}*** ${COLGREEN} CC${COLDEFAULT}='${CC}'" - echo -e "${COLBLUE}*** ${COLGREEN} CXX${COLDEFAULT}='${CXX}'" - echo -e "${COLBLUE}*** ${COLGREEN} ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'" - if [[ ${EXPORT_ABI_LDFLAGS} != false ]] + if [[ ${MULTILIB_VERBOSE} = true ]] then - echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${LDFLAGS}'" - else - echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'" + echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}" + echo -e "${COLBLUE}*** ${COLGREEN} ABI${COLDEFAULT}='${ABI}'" + echo -e "${COLBLUE}*** ${COLGREEN} CC${COLDEFAULT}='${CC}'" + echo -e "${COLBLUE}*** ${COLGREEN} CXX${COLDEFAULT}='${CXX}'" + echo -e "${COLBLUE}*** ${COLGREEN} ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'" + if [[ ${EXPORT_ABI_LDFLAGS} != false ]] + then + echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${LDFLAGS}'" + else + echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'" + fi + echo -e "${COLBLUE}*** ${COLGREEN} CHOST${COLDEFAULT}='${CHOST}'" + echo -e "${COLBLUE}*** ${COLGREEN} PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'" fi - echo -e "${COLBLUE}*** ${COLGREEN} CHOST${COLDEFAULT}='${CHOST}'" - echo -e "${COLBLUE}*** ${COLGREEN} PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'" # run any given command eval $@ || die