--- trunk/core/include/multilib.sminc 2010/08/23 11:25:26 6406 +++ trunk/include/multilib.sminc 2017/10/12 13:30:10 29801 @@ -1,6 +1,15 @@ # $Id$ # multilib abis +# tell the buildsystem that we are doing a multilib build +export MULTILIB_BUILD="true" + +# be verbose or nor (true|false} +: ${MULTILIB_VERBOSE="true"} + +# multilib should call all dependant includes, which gets overridden +sminclude mtools + # do not define EMUL_LINUX_32 after inherit of multlib !! # it may break i*86 builds @@ -14,7 +23,7 @@ # add linux32 to the dependencies if [[ ${EMUL_LINUX_32} = true ]] then - EMUL_LINUX_32_SDEPEND_x86_64=">= dev-util/linux32-1" + EMUL_LINUX_32_SDEPEND_x86_64=">= sys-apps/util-linux-2.19" SPECIAL_VARS="${SPECIAL_VARS} EMUL_LINUX_32_SDEPEND_x86_64" fi ;; @@ -33,10 +42,10 @@ # the var ist decided with our common eval+echo magic if [[ -z ${SDEPEND} ]] then - SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')" + SDEPEND="$(marchsdepend EMUL_LINUX_32_SDEPEND)" else SDEPEND="${SDEPEND} - \$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')" + $(marchsdepend EMUL_LINUX_32_SDEPEND)" fi fi @@ -63,46 +72,63 @@ export ABI_LIBDIR="lib" if [[ ${EXPORT_ABI_LDFLAGS} != false ]] then - export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}" + local saved_ldflags="${LDFLAGS}" + export LDFLAGS="${LDFLAGS} -L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}" fi # keep pkgconfig clean 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} SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'" + 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" + local orig_chost="${CHOST}" && export CHOST="i686-pc-linux-gnu" + fi + if [[ ${MULTILIB_VERBOSE} = true ]] + then + echo -e "${COLBLUE}*** ${COLGREEN} CHOST${COLDEFAULT}='${CHOST}'" fi - echo -e "${COLBLUE}*** ${COLGREEN} CHOST${COLDEFAULT}='${CHOST}'" # run any given command + if [[ ${MULTILIB_VERBOSE} = true ]] + then + echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'" + fi eval $@ || die - unset ABI CC CXX ABI_LIBDIR LDFLAGS + unset ABI CC CXX ABI_LIBDIR # keep pkgconfig clean export PKG_CONFIG_PATH="${orig_pkg_config_path}" + export LDFLAGS="${saved_ldflags}" # restore original settings if [[ ${EMUL_LINUX_32} = true ]] then unset uname - export CHOST="${ORIG_CHOST}" && unset ORIG_CHOST + export CHOST="${orig_chost}" && unset orig_chost fi } @@ -114,32 +140,42 @@ export ABI_LIBDIR="lib64" if [[ ${EXPORT_ABI_LDFLAGS} != false ]] then + local saved_ldflags="${LDFLAGS}" export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}" fi # keep pkgconfig clean 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} SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'" + 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 + if [[ ${MULTILIB_VERBOSE} = true ]] + then + echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'" + fi eval $@ || die - unset ABI CC CXX ABI_LIBDIR LDFLAGS + unset ABI CC CXX ABI_LIBDIR # keep pkgconfig clean export PKG_CONFIG_PATH="${orig_pkg_config_path}" + export LDFLAGS="${saved_ldflags}" } only-m32() @@ -154,7 +190,7 @@ # export this for mpatch etc (to repect only-${abi}) export MULTILIB_ONLY_ABI=${abi} - cd ${SRCDIR}-${abi} + cd ${SRCDIR}-${abi}/${SRCSUBDIR} abi-${abi} $@ || die # unset this is very important @@ -175,7 +211,7 @@ # export this for mpatch etc (to repect only-${abi}) export MULTILIB_ONLY_ABI=${abi} - cd ${SRCDIR}-${abi} + cd ${SRCDIR}-${abi}/${SRCSUBDIR} abi-${abi} $@ || die # unset this is very important @@ -189,7 +225,7 @@ local abi for abi in ${MULTILIB_ABIS} do - cd ${SRCDIR}-${abi} + cd ${SRCDIR}-${abi}/${SRCSUBDIR} abi-${abi} $@ || die done } @@ -199,6 +235,31 @@ echo \${ABI} } +mabi-cc() +{ + echo "gcc -\${ABI}" +} + +mabi-cxx() +{ + echo "g++ -\${ABI}" +} + +mabi-cflags() +{ + echo "\${CFLAGS}" +} + +mabi-cxxflags() +{ + echo "\${CXXFLAGS}" +} + +mabi-ldflags() +{ + echo "\${LDFLAGS}" +} + ## # multilib compile functions ## @@ -208,7 +269,7 @@ # rename the old one old_mconfigure=old$(typeset -f mconfigure) eval "${old_mconfigure}" -fi + mconfigure() { local abi @@ -219,40 +280,18 @@ for abi in ${abis_to_run} do - cd ${SRCDIR}-${abi} + cd ${SRCDIR}-${abi}/${SRCSUBDIR} abi-${abi} oldmconfigure $@ || die done } - -if [[ ! -z $(typeset -f cmake_configure) ]] -then - # rename the old one - old_cmake_configure=old$(typeset -f cmake_configure) - eval "${old_cmake_configure}" fi -cmake_configure() -{ - local abi - local abis_to_run="${MULTILIB_ABIS}" - - # respect MULTILIB_ONLY_ABI variable - [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}" - - local saved_SRCDIR="${SRCDIR}" - for abi in ${abis_to_run} - do - SRCDIR="${saved_SRCDIR}-${abi}" - cd ${SRCDIR} - abi-${abi} oldcmake_configure $@ || die - done -} if [[ ! -z $(typeset -f munpack) ]] then # rename the old one old_munpack=old$(typeset -f munpack) eval "${old_munpack}" -fi + munpack() { local abi @@ -264,17 +303,18 @@ for abi in ${abis_to_run} do echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}" - oldmunpack ${SRCFILE} || die + oldmunpack $@ || die mv ${SRCDIR} ${SRCDIR}-${abi} || die done } +fi if [[ ! -z $(typeset -f mmake) ]] then # rename the old one old_mmake=old$(typeset -f mmake) eval "${old_mmake}" -fi + mmake() { local abi @@ -286,17 +326,18 @@ for abi in ${abis_to_run} do echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}" - cd ${SRCDIR}-${abi} + cd ${SRCDIR}-${abi}/${SRCSUBDIR} abi-${abi} oldmmake $@ || die done } +fi if [[ ! -z $(typeset -f minstall) ]] then # rename the old one old_minstall=old$(typeset -f minstall) eval "${old_minstall}" -fi + minstall() { local abi @@ -308,10 +349,11 @@ for abi in ${abis_to_run} do echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}" - cd ${SRCDIR}-${abi} + cd ${SRCDIR}-${abi}/${SRCSUBDIR} abi-${abi} oldminstall $@ || die done } +fi minstall_destdir() { @@ -324,7 +366,7 @@ for abi in ${abis_to_run} do echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}" - cd ${SRCDIR}-${abi} + cd ${SRCDIR}-${abi}/${SRCSUBDIR} make DESTDIR=${BINDIR} $@ install || die done } @@ -334,7 +376,7 @@ # rename the old one old_mpatch=old$(typeset -f mpatch) eval "${old_mpatch}" -fi + mpatch() { local abi @@ -346,17 +388,18 @@ for abi in ${abis_to_run} do echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}" - cd ${SRCDIR}-${abi} + cd ${SRCDIR}-${abi}/${SRCSUBDIR} oldmpatch $@ || die done } +fi if [[ ! -z $(typeset -f mlibtoolize) ]] then # rename the old one old_mlibtoolize=old$(typeset -f mlibtoolize) eval "${old_mlibtoolize}" -fi + mlibtoolize() { local abi @@ -368,17 +411,21 @@ for abi in ${abis_to_run} do echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}" - cd ${SRCDIR}-${abi} + cd ${SRCDIR}-${abi}/${SRCSUBDIR} oldmlibtoolize $@ || die done } +fi -minstalldocs() +if [[ ! -z $(typeset -f mautoreconf) ]] +then + # rename the old one + old_mautoreconf=old$(typeset -f mautoreconf) + eval "${old_mautoreconf}" + +mautoreconf() { local abi - local docfiles - docfiles="$@" - local abis_to_run="${MULTILIB_ABIS}" # respect MULTILIB_ONLY_ABI variable @@ -386,52 +433,33 @@ for abi in ${abis_to_run} do - cd ${SRCDIR}-${abi} - if [ ! -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} ] - then - install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs." - fi - - for i in ${docfiles} - do - cat ${SRCDIR}-${abi}/${i} | gzip -9c > ${SRCDIR}-${abi}/${i}.gz || die "gzipping docs." - install -m 0644 ${SRCDIR}-${abi}/${i}.gz \ - ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs." - done + echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}" + cd ${SRCDIR}-${abi}/${SRCSUBDIR} + oldmautoreconf $@ || die done } +fi -## -# multilib mbuild wrappers -## -multilib_src_prepare() -{ - munpack -} +if [[ ! -z $(typeset -f minstalldocs) ]] +then + # rename the old one + old_minstalldocs=old$(typeset -f minstalldocs) + eval "${old_minstalldocs}" -multilib_src_compile() +minstalldocs() { - mconfigure - mmake -} + local abi + local docfiles -multilib_src_install() -{ - minstall_destdir + local abis_to_run="${MULTILIB_ABIS}" - local i - for abi in ${MULTILIB_ABIS} + # respect MULTILIB_ONLY_ABI variable + [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}" + + for abi in ${abis_to_run} do - cd ${SRCDIR}-${abi} - for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \ - FAQ LICENSE NEWS README TODO - do - if [ -f ${SRCDIR}-${abi}/${i} ] - then - minstalldocs ${i} || die - fi - done + cd ${SRCDIR}-${abi}/${SRCSUBDIR} + oldminstalldocs $@ || die done } - -export_inherits multilib src_prepare src_compile src_install +fi