Magellan Linux

  • Back to homepage
    • /[smage]/branches/R11-unstable/include/multilib.sminc

    Diff of /branches/R11-unstable/include/multilib.sminc

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 11828 by niro, Wed Apr 18 21:46:01 2012 UTC revision 29795 by niro, Thu Oct 12 11:55:58 2017 UTC
    # Line 42  then Line 42  then
    42   # the var ist decided with our common eval+echo magic   # the var ist decided with our common eval+echo magic
    43   if [[ -z ${SDEPEND} ]]   if [[ -z ${SDEPEND} ]]
    44   then   then
    45   SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   SDEPEND="$(marchsdepend EMUL_LINUX_32_SDEPEND)"
    46   else   else
    47   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
    48   \$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   $(marchsdepend EMUL_LINUX_32_SDEPEND)"
    49   fi   fi
    50  fi  fi
    51    
    # Line 105  abi-m32() Line 105  abi-m32()
    105   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"
    106   fi   fi
    107   uname(){ linux32 uname $@; } && export -f uname   uname(){ linux32 uname $@; } && export -f uname
    108   ORIG_CHOST="${CHOST}" && export CHOST="i686-pc-linux-gnu"   local orig_chost="${CHOST}" && export CHOST="i686-pc-linux-gnu"
    109   fi   fi
    110   if [[ ${MULTILIB_VERBOSE} = true ]]   if [[ ${MULTILIB_VERBOSE} = true ]]
    111   then   then
    # Line 113  abi-m32() Line 113  abi-m32()
    113   fi   fi
    114    
    115   # run any given command   # run any given command
    116     if [[ ${MULTILIB_VERBOSE} = true ]]
    117     then
    118     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    119     fi
    120   eval $@ || die   eval $@ || die
    121    
    122   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR
    # Line 124  abi-m32() Line 128  abi-m32()
    128   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    129   then   then
    130   unset uname   unset uname
    131   export CHOST="${ORIG_CHOST}" && unset ORIG_CHOST   export CHOST="${orig_chost}" && unset orig_chost
    132   fi   fi
    133  }  }
    134    
    # Line 162  abi-m64() Line 166  abi-m64()
    166   fi   fi
    167    
    168   # run any given command   # run any given command
    169     if [[ ${MULTILIB_VERBOSE} = true ]]
    170     then
    171     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    172     fi
    173   eval $@ || die   eval $@ || die
    174    
    175   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR
    # Line 229  mabi() Line 237  mabi()
    237    
    238  mabi-cc()  mabi-cc()
    239  {  {
    240   echo "\"gcc -\${ABI}\""   echo "gcc -\${ABI}"
    241  }  }
    242    
    243  mabi-cxx()  mabi-cxx()
    244  {  {
    245   echo "\"g++ -\${ABI}\""   echo "g++ -\${ABI}"
    246  }  }
    247    
    248  mabi-cflags()  mabi-cflags()
    249  {  {
    250   echo "\"\${CFLAGS}\""   echo "\${CFLAGS}"
    251  }  }
    252    
    253  mabi-cxxflags()  mabi-cxxflags()
    254  {  {
    255   echo "\"\${CXXFLAGS}\""   echo "\${CXXFLAGS}"
    256  }  }
    257    
    258  mabi-ldflags()  mabi-ldflags()
    259  {  {
    260   echo "\"\${LDFLAGS}\""   echo "\${LDFLAGS}"
    261  }  }
    262    
    263  ##  ##
    # Line 261  then Line 269  then
    269   # rename the old one   # rename the old one
    270   old_mconfigure=old$(typeset -f mconfigure)   old_mconfigure=old$(typeset -f mconfigure)
    271   eval "${old_mconfigure}"   eval "${old_mconfigure}"
    272  fi  
    273  mconfigure()  mconfigure()
    274  {  {
    275   local abi   local abi
    # Line 276  mconfigure() Line 284  mconfigure()
    284   abi-${abi} oldmconfigure $@ || die   abi-${abi} oldmconfigure $@ || die
    285   done   done
    286  }  }
    287    fi
    288    
    289  if [[ ! -z $(typeset -f cmake_configure) ]]  if [[ ! -z $(typeset -f cmake_configure) ]]
    290  then  then
    291   # rename the old one   # rename the old one
    292   old_cmake_configure=old$(typeset -f cmake_configure)   old_cmake_configure=old$(typeset -f cmake_configure)
    293   eval "${old_cmake_configure}"   eval "${old_cmake_configure}"
    294  fi  
    295  cmake_configure()  cmake_configure()
    296  {  {
    297   local abi   local abi
    # Line 295  cmake_configure() Line 304  cmake_configure()
    304   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    305   do   do
    306   SRCDIR="${saved_SRCDIR}-${abi}"   SRCDIR="${saved_SRCDIR}-${abi}"
    307   cd ${SRCDIR}/${SRCSUBDIR}   # honor inside and outside build-dir builds
    308     if [ -d ${BUILDDIR}/build-${abi} ]
    309     then
    310     cd ${BUILDDIR}/build-${abi}
    311     else
    312     cd ${SRCDIR}
    313     fi
    314   abi-${abi} oldcmake_configure $@ || die   abi-${abi} oldcmake_configure $@ || die
    315   done   done
    316   # restore SRCDIR   # restore SRCDIR
    317   SRCDIR="${saved_SRCDIR}"   SRCDIR="${saved_SRCDIR}"
    318  }  }
    319    fi
    320    
    321    if [[ ! -z $(typeset -f cmake_src_compile) ]]
    322    then
    323     # rename the old one
    324     old_cmake_src_compile=old$(typeset -f cmake_src_compile)
    325     eval "${old_cmake_src_compile}"
    326    
    327    cmake_src_compile()
    328    {
    329     local abi
    330     local abis_to_run="${MULTILIB_ABIS}"
    331    
    332     # respect MULTILIB_ONLY_ABI variable
    333     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    334    
    335     for abi in ${abis_to_run}
    336     do
    337     # remove build dir if exist
    338     [[ -d ${BUILDDIR}/build-${abi} ]] && rm -rf ${BUILDDIR}/build-${abi}
    339    
    340     # build outside of the source dir
    341     install -d ${BUILDDIR}/build-${abi} || die
    342     cd ${BUILDDIR}/build-${abi}
    343     done
    344    
    345     cmake_configure || die
    346    
    347     for abi in ${abis_to_run}
    348     do
    349     cd ${BUILDDIR}/build-${abi}
    350     abi-${abi} oldmmake $@ || die
    351     done
    352    }
    353    fi
    354    
    355    if [[ ! -z $(typeset -f cmake_src_check) ]]
    356    then
    357     # rename the old one
    358     old_cmake_src_check=old$(typeset -f cmake_src_check)
    359     eval "${old_cmake_check}"
    360    
    361    cmake_src_check()
    362    {
    363     local abi
    364     local abis_to_run="${MULTILIB_ABIS}"
    365    
    366     # respect MULTILIB_ONLY_ABI variable
    367     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    368    
    369     for abi in ${abis_to_run}
    370     do
    371     # honor inside and outside build-dir builds
    372     if [ -d ${BUILDDIR}/build-${abi} ]
    373     then
    374     cd ${BUILDDIR}/build-${abi}
    375     else
    376     cd ${SRCDIR}-${abi}
    377     fi
    378     mmake -j1 -k check || die
    379     done
    380    }
    381    fi
    382    
    383    if [[ ! -z $(typeset -f cmake_src_install) ]]
    384    then
    385     # rename the old one
    386     old_cmake_src_install=old$(typeset -f cmake_src_install)
    387     eval "${old_cmake_install}"
    388    
    389    cmake_src_install()
    390    {
    391     local abi
    392     local abis_to_run="${MULTILIB_ABIS}"
    393    
    394     # respect MULTILIB_ONLY_ABI variable
    395     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    396    
    397     for abi in ${abis_to_run}
    398     do
    399     # honor inside and outside build-dir builds
    400     if [ -d ${BUILDDIR}/build-${abi} ]
    401     then
    402     cd ${BUILDDIR}/build-${abi}
    403     else
    404     cd ${SRCDIR}-${abi}
    405     fi
    406     abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die
    407     done
    408    }
    409    fi
    410    
    411  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
    412  then  then
    413   # rename the old one   # rename the old one
    414   old_munpack=old$(typeset -f munpack)   old_munpack=old$(typeset -f munpack)
    415   eval "${old_munpack}"   eval "${old_munpack}"
    416  fi  
    417  munpack()  munpack()
    418  {  {
    419   local abi   local abi
    # Line 319  munpack() Line 425  munpack()
    425   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    426   do   do
    427   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
    428   oldmunpack ${SRCFILE} || die   oldmunpack $@ || die
    429   mv ${SRCDIR} ${SRCDIR}-${abi} || die   mv ${SRCDIR} ${SRCDIR}-${abi} || die
    430   done   done
    431  }  }
    432    fi
    433    
    434  if [[ ! -z $(typeset -f mmake) ]]  if [[ ! -z $(typeset -f mmake) ]]
    435  then  then
    436   # rename the old one   # rename the old one
    437   old_mmake=old$(typeset -f mmake)   old_mmake=old$(typeset -f mmake)
    438   eval "${old_mmake}"   eval "${old_mmake}"
    439  fi  
    440  mmake()  mmake()
    441  {  {
    442   local abi   local abi
    # Line 345  mmake() Line 452  mmake()
    452   abi-${abi} oldmmake $@ || die   abi-${abi} oldmmake $@ || die
    453   done   done
    454  }  }
    455    fi
    456    
    457  if [[ ! -z $(typeset -f minstall) ]]  if [[ ! -z $(typeset -f minstall) ]]
    458  then  then
    459   # rename the old one   # rename the old one
    460   old_minstall=old$(typeset -f minstall)   old_minstall=old$(typeset -f minstall)
    461   eval "${old_minstall}"   eval "${old_minstall}"
    462  fi  
    463  minstall()  minstall()
    464  {  {
    465   local abi   local abi
    # Line 367  minstall() Line 475  minstall()
    475   abi-${abi} oldminstall $@ || die   abi-${abi} oldminstall $@ || die
    476   done   done
    477  }  }
    478    fi
    479    
    480  minstall_destdir()  minstall_destdir()
    481  {  {
    # Line 389  then Line 498  then
    498   # rename the old one   # rename the old one
    499   old_mpatch=old$(typeset -f mpatch)   old_mpatch=old$(typeset -f mpatch)
    500   eval "${old_mpatch}"   eval "${old_mpatch}"
    501  fi  
    502  mpatch()  mpatch()
    503  {  {
    504   local abi   local abi
    # Line 405  mpatch() Line 514  mpatch()
    514   oldmpatch $@ || die   oldmpatch $@ || die
    515   done   done
    516  }  }
    517    fi
    518    
    519  if [[ ! -z $(typeset -f mlibtoolize) ]]  if [[ ! -z $(typeset -f mlibtoolize) ]]
    520  then  then
    521   # rename the old one   # rename the old one
    522   old_mlibtoolize=old$(typeset -f mlibtoolize)   old_mlibtoolize=old$(typeset -f mlibtoolize)
    523   eval "${old_mlibtoolize}"   eval "${old_mlibtoolize}"
    524  fi  
    525  mlibtoolize()  mlibtoolize()
    526  {  {
    527   local abi   local abi
    # Line 427  mlibtoolize() Line 537  mlibtoolize()
    537   oldmlibtoolize $@ || die   oldmlibtoolize $@ || die
    538   done   done
    539  }  }
    540    fi
    541    
    542  if [[ ! -z $(typeset -f mautoreconf) ]]  if [[ ! -z $(typeset -f mautoreconf) ]]
    543  then  then
    544   # rename the old one   # rename the old one
    545   old_mautoreconf=old$(typeset -f mautoreconf)   old_mautoreconf=old$(typeset -f mautoreconf)
    546   eval "${old_mautoreconf}"   eval "${old_mautoreconf}"
    547  fi  
    548  mautoreconf()  mautoreconf()
    549  {  {
    550   local abi   local abi
    # Line 449  mautoreconf() Line 560  mautoreconf()
    560   oldmautoreconf $@ || die   oldmautoreconf $@ || die
    561   done   done
    562  }  }
    563    fi
    564    
    565  if [[ ! -z $(typeset -f minstalldocs) ]]  if [[ ! -z $(typeset -f minstalldocs) ]]
    566  then  then
    567   # rename the old one   # rename the old one
    568   old_minstalldocs=old$(typeset -f minstalldocs)   old_minstalldocs=old$(typeset -f minstalldocs)
    569   eval "${old_minstalldocs}"   eval "${old_minstalldocs}"
    570  fi  
    571  minstalldocs()  minstalldocs()
    572  {  {
    573   local abi   local abi
    # Line 472  minstalldocs() Line 584  minstalldocs()
    584   oldminstalldocs $@ || die   oldminstalldocs $@ || die
    585   done   done
    586  }  }
    587    fi
    588    
    589  ##  ##
    590  # multilib mbuild wrappers  # multilib mbuild wrappers
    591  ##  ##
    592  multilib_src_prepare()  multilib_src_prepare()
    593  {  {
    594   munpack   munpack ${SRCFILE} || die
    595  }  }
    596    
    597  multilib_src_compile()  multilib_src_compile()
    598  {  {
    599   mconfigure   if [[ ! -z $(typeset -f cmake_src_compile) ]]
    600   mmake   then
    601     cmake_src_compile || die
    602     else
    603     mconfigure || die
    604     mmake || die
    605     fi
    606  }  }
    607    
    608  multilib_src_check()  multilib_src_check()
    609  {  {
    610   mmake -j1 -k check || die   if [[ ! -z $(typeset -f cmake_src_check) ]]
    611     then
    612     cmake_src_check || die
    613     else
    614     mmake -j1 -k check || die
    615     fi
    616  }  }
    617    
    618  multilib_src_install()  multilib_src_install()
    619  {  {
    620   minstall_destdir   if [[ ! -z $(typeset -f cmake_src_install) ]]
    621     then
    622     cmake_src_install || die
    623     else
    624     mmake DESTDIR=${BINDIR} install || die
    625     fi
    626    
    627   local i   local i
    628   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
    Legend:
    Removed from v.11828  
    changed lines
      Added in v.29795