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

    trunk/core/include/multilib.sminc revision 5486 by niro, Tue Jun 29 23:17:45 2010 UTC trunk/include/multilib.sminc revision 22067 by niro, Fri Aug 22 12:29:21 2014 UTC
    # Line 1  Line 1 
    1  # $Header: /magellan-cvs/smage/include/multilib.sminc,v 1.33 2007-11-13 15:49:09 niro Exp $  # $Id$
    2  # multilib abis  # multilib abis
    3    
    4    # tell the buildsystem that we are doing a multilib build
    5    export MULTILIB_BUILD="true"
    6    
    7    # be verbose or nor (true|false}
    8    : ${MULTILIB_VERBOSE="true"}
    9    
    10    # multilib should call all dependant includes, which gets overridden
    11    sminclude mtools
    12    
    13  # do not define EMUL_LINUX_32 after inherit of multlib !!  # do not define EMUL_LINUX_32 after inherit of multlib !!
    14  # it may break i*86 builds  # it may break i*86 builds
    15    
    # Line 14  case ${ARCH} in Line 23  case ${ARCH} in
    23   # add linux32 to the dependencies   # add linux32 to the dependencies
    24   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    25   then   then
    26   EMUL_LINUX_32_SDEPENDS_x86_64=">= dev-util/linux32-1"   EMUL_LINUX_32_SDEPEND_x86_64=">= sys-apps/util-linux-2.19"
    27   SPECIAL_VARS="${SPECIAL_VARS} EMUL_LINUX_32_SDEPENDS_x86_64"   SPECIAL_VARS="${SPECIAL_VARS} EMUL_LINUX_32_SDEPEND_x86_64"
    28   fi   fi
    29   ;;   ;;
    30   i*86)   i*86)
    # Line 33  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_SDEPENDS_\${ARCH/i*86/x86} | tr ';' '\n')"   SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
    46   else   else
    47   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
    48   \$(eval echo \\\$EMUL_LINUX_32_SDEPENDS_\${ARCH/i*86/x86} | tr ';' '\n')"   \$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
    49   fi   fi
    50  fi  fi
    51    
    # Line 63  abi-m32() Line 72  abi-m32()
    72   export ABI_LIBDIR="lib"   export ABI_LIBDIR="lib"
    73   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    74   then   then
    75   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   local saved_ldflags="${LDFLAGS}"
    76     export LDFLAGS="${LDFLAGS} -L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    77   fi   fi
    78   # keep pkgconfig clean   # keep pkgconfig clean
    79   local orig_pkg_config_path="${PKG_CONFIG_PATH}"   local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    80   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    81    
    82   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   if [[ ${MULTILIB_VERBOSE} = true ]]
      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 ]]  
    83   then   then
    84   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    85   else   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
    86   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
    87     echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
    88     echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
    89     if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    90     then
    91     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
    92     else
    93     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
    94     fi
    95     echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
    96     echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
    97     echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
    98   fi   fi
      echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"  
    99    
    100   # configure a linux32 emulated build   # configure a linux32 emulated build
    101   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    102   then   then
    103   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"   if [[ ${MULTILIB_VERBOSE} = true ]]
    104     then
    105     echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"
    106     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
    110     if [[ ${MULTILIB_VERBOSE} = true ]]
    111     then
    112     echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
    113   fi   fi
      echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"  
    114    
    115   # run any given command   # run any given command
    116   eval $@ || die   eval $@ || die
    117    
    118   unset ABI CC CXX ABI_LIBDIR LDFLAGS   unset ABI CC CXX ABI_LIBDIR
    119   # keep pkgconfig clean   # keep pkgconfig clean
    120   export PKG_CONFIG_PATH="${orig_pkg_config_path}"   export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    121     export LDFLAGS="${saved_ldflags}"
    122    
    123   # restore original settings   # restore original settings
    124   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    125   then   then
    126   unset uname   unset uname
    127   export CHOST="${ORIG_CHOST}" && unset ORIG_CHOST   export CHOST="${orig_chost}" && unset orig_chost
    128   fi   fi
    129  }  }
    130    
    # Line 114  abi-m64() Line 136  abi-m64()
    136   export ABI_LIBDIR="lib64"   export ABI_LIBDIR="lib64"
    137   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    138   then   then
    139     local saved_ldflags="${LDFLAGS}"
    140   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    141   fi   fi
    142   # keep pkgconfig clean   # keep pkgconfig clean
    143   local orig_pkg_config_path="${PKG_CONFIG_PATH}"   local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    144   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    145    
    146   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   if [[ ${MULTILIB_VERBOSE} = true ]]
      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 ]]  
    147   then   then
    148   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    149   else   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
    150   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
    151     echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
    152     echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
    153     if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    154     then
    155     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
    156     else
    157     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
    158     fi
    159     echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
    160     echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
    161     echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
    162   fi   fi
      echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"  
      echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"  
    163    
    164   # run any given command   # run any given command
    165   eval $@ || die   eval $@ || die
    166    
    167   unset ABI CC CXX ABI_LIBDIR LDFLAGS   unset ABI CC CXX ABI_LIBDIR
    168   # keep pkgconfig clean   # keep pkgconfig clean
    169   export PKG_CONFIG_PATH="${orig_pkg_config_path}"   export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    170     export LDFLAGS="${saved_ldflags}"
    171  }  }
    172    
    173  only-m32()  only-m32()
    # Line 154  only-m32() Line 182  only-m32()
    182   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    183   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    184    
    185   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    186   abi-${abi} $@ || die   abi-${abi} $@ || die
    187    
    188   # unset this is very important   # unset this is very important
    # Line 175  only-m64() Line 203  only-m64()
    203   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    204   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    205    
    206   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    207   abi-${abi} $@ || die   abi-${abi} $@ || die
    208    
    209   # unset this is very important   # unset this is very important
    # Line 189  all-abis() Line 217  all-abis()
    217   local abi   local abi
    218   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
    219   do   do
    220   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    221   abi-${abi} $@ || die   abi-${abi} $@ || die
    222   done   done
    223  }  }
    224    
    225    mabi()
    226    {
    227     echo \${ABI}
    228    }
    229    
    230    mabi-cc()
    231    {
    232     echo "gcc -\${ABI}"
    233    }
    234    
    235    mabi-cxx()
    236    {
    237     echo "g++ -\${ABI}"
    238    }
    239    
    240    mabi-cflags()
    241    {
    242     echo "\${CFLAGS}"
    243    }
    244    
    245    mabi-cxxflags()
    246    {
    247     echo "\${CXXFLAGS}"
    248    }
    249    
    250    mabi-ldflags()
    251    {
    252     echo "\${LDFLAGS}"
    253    }
    254    
    255  ##  ##
    256  # multilib compile functions  # multilib compile functions
    257  ##  ##
    # Line 203  then Line 261  then
    261   # rename the old one   # rename the old one
    262   old_mconfigure=old$(typeset -f mconfigure)   old_mconfigure=old$(typeset -f mconfigure)
    263   eval "${old_mconfigure}"   eval "${old_mconfigure}"
    264  fi  
    265  mconfigure()  mconfigure()
    266  {  {
    267   local abi   local abi
    # Line 214  mconfigure() Line 272  mconfigure()
    272    
    273   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    274   do   do
    275   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    276   abi-${abi} oldmconfigure $@ || die   abi-${abi} oldmconfigure $@ || die
    277   done   done
    278  }  }
    279    fi
    280    
    281  if [[ ! -z $(typeset -f cmake_configure) ]]  if [[ ! -z $(typeset -f cmake_configure) ]]
    282  then  then
    283   # rename the old one   # rename the old one
    284   old_cmake_configure=old$(typeset -f cmake_configure)   old_cmake_configure=old$(typeset -f cmake_configure)
    285   eval "${old_cmake_configure}"   eval "${old_cmake_configure}"
    286  fi  
    287  cmake_configure()  cmake_configure()
    288  {  {
    289   local abi   local abi
    # Line 237  cmake_configure() Line 296  cmake_configure()
    296   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    297   do   do
    298   SRCDIR="${saved_SRCDIR}-${abi}"   SRCDIR="${saved_SRCDIR}-${abi}"
    299   cd ${SRCDIR}   # honor inside and outside build-dir builds
    300     if [ -d ${BUILDDIR}/build-${abi} ]
    301     then
    302     cd ${BUILDDIR}/build-${abi}
    303     else
    304     cd ${SRCDIR}-${abi}
    305     fi
    306   abi-${abi} oldcmake_configure $@ || die   abi-${abi} oldcmake_configure $@ || die
    307   done   done
    308     # restore SRCDIR
    309     SRCDIR="${saved_SRCDIR}"
    310    }
    311    fi
    312    
    313    if [[ ! -z $(typeset -f cmake_src_compile) ]]
    314    then
    315     # rename the old one
    316     old_cmake_src_compile=old$(typeset -f cmake_src_compile)
    317     eval "${old_cmake_src_compile}"
    318    
    319    cmake_src_compile()
    320    {
    321     local abi
    322     local abis_to_run="${MULTILIB_ABIS}"
    323    
    324     # respect MULTILIB_ONLY_ABI variable
    325     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    326    
    327     for abi in ${abis_to_run}
    328     do
    329     # remove build dir if exist
    330     [[ -d ${BUILDDIR}/build-${abi} ]] && rm -rf ${BUILDDIR}/build-${abi}
    331    
    332     # build outside of the source dir
    333     install -d ${BUILDDIR}/build-${abi} || die
    334     cd ${BUILDDIR}/build-${abi}
    335     done
    336    
    337     cmake_configure || die
    338    
    339     for abi in ${abis_to_run}
    340     do
    341     cd ${BUILDDIR}/build-${abi}
    342     abi-${abi} oldmmake $@ || die
    343     done
    344    }
    345    fi
    346    
    347    if [[ ! -z $(typeset -f cmake_src_check) ]]
    348    then
    349     # rename the old one
    350     old_cmake_src_check=old$(typeset -f cmake_src_check)
    351     eval "${old_cmake_check}"
    352    
    353    cmake_src_check()
    354    {
    355     local abi
    356     local abis_to_run="${MULTILIB_ABIS}"
    357    
    358     # respect MULTILIB_ONLY_ABI variable
    359     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    360    
    361     for abi in ${abis_to_run}
    362     do
    363     # honor inside and outside build-dir builds
    364     if [ -d ${BUILDDIR}/build-${abi} ]
    365     then
    366     cd ${BUILDDIR}/build-${abi}
    367     else
    368     cd ${SRCDIR}-${abi}
    369     fi
    370     mmake -j1 -k check || die
    371     done
    372    }
    373    fi
    374    
    375    if [[ ! -z $(typeset -f cmake_src_install) ]]
    376    then
    377     # rename the old one
    378     old_cmake_src_install=old$(typeset -f cmake_src_install)
    379     eval "${old_cmake_install}"
    380    
    381    cmake_src_install()
    382    {
    383     local abi
    384     local abis_to_run="${MULTILIB_ABIS}"
    385    
    386     # respect MULTILIB_ONLY_ABI variable
    387     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    388    
    389     for abi in ${abis_to_run}
    390     do
    391     # honor inside and outside build-dir builds
    392     if [ -d ${BUILDDIR}/build-${abi} ]
    393     then
    394     cd ${BUILDDIR}/build-${abi}
    395     else
    396     cd ${SRCDIR}-${abi}
    397     fi
    398     abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die
    399     done
    400  }  }
    401    fi
    402    
    403  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
    404  then  then
    405   # rename the old one   # rename the old one
    406   old_munpack=old$(typeset -f munpack)   old_munpack=old$(typeset -f munpack)
    407   eval "${old_munpack}"   eval "${old_munpack}"
    408  fi  
    409  munpack()  munpack()
    410  {  {
    411   local abi   local abi
    # Line 259  munpack() Line 417  munpack()
    417   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    418   do   do
    419   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
    420   oldmunpack ${SRCFILE} || die   oldmunpack $@ || die
    421   mv ${SRCDIR} ${SRCDIR}-${abi} || die   mv ${SRCDIR} ${SRCDIR}-${abi} || die
    422   done   done
    423  }  }
    424    fi
    425    
    426  if [[ ! -z $(typeset -f mmake) ]]  if [[ ! -z $(typeset -f mmake) ]]
    427  then  then
    428   # rename the old one   # rename the old one
    429   old_mmake=old$(typeset -f mmake)   old_mmake=old$(typeset -f mmake)
    430   eval "${old_mmake}"   eval "${old_mmake}"
    431  fi  
    432  mmake()  mmake()
    433  {  {
    434   local abi   local abi
    # Line 281  mmake() Line 440  mmake()
    440   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    441   do   do
    442   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"
    443   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    444   abi-${abi} oldmmake $@ || die   abi-${abi} oldmmake $@ || die
    445   done   done
    446  }  }
    447    fi
    448    
    449  if [[ ! -z $(typeset -f minstall) ]]  if [[ ! -z $(typeset -f minstall) ]]
    450  then  then
    451   # rename the old one   # rename the old one
    452   old_minstall=old$(typeset -f minstall)   old_minstall=old$(typeset -f minstall)
    453   eval "${old_minstall}"   eval "${old_minstall}"
    454  fi  
    455  minstall()  minstall()
    456  {  {
    457   local abi   local abi
    # Line 303  minstall() Line 463  minstall()
    463   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    464   do   do
    465   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    466   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    467   abi-${abi} oldminstall $@ || die   abi-${abi} oldminstall $@ || die
    468   done   done
    469  }  }
    470    fi
    471    
    472  minstall_destdir()  minstall_destdir()
    473  {  {
    # Line 319  minstall_destdir() Line 480  minstall_destdir()
    480   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    481   do   do
    482   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    483   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    484   make DESTDIR=${BINDIR} $@ install || die   make DESTDIR=${BINDIR} $@ install || die
    485   done   done
    486  }  }
    # Line 329  then Line 490  then
    490   # rename the old one   # rename the old one
    491   old_mpatch=old$(typeset -f mpatch)   old_mpatch=old$(typeset -f mpatch)
    492   eval "${old_mpatch}"   eval "${old_mpatch}"
    493  fi  
    494  mpatch()  mpatch()
    495  {  {
    496   local abi   local abi
    # Line 341  mpatch() Line 502  mpatch()
    502   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    503   do   do
    504   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"
    505   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    506   oldmpatch $@ || die   oldmpatch $@ || die
    507   done   done
    508  }  }
    509    fi
    510    
    511  if [[ ! -z $(typeset -f mlibtoolize) ]]  if [[ ! -z $(typeset -f mlibtoolize) ]]
    512  then  then
    513   # rename the old one   # rename the old one
    514   old_mlibtoolize=old$(typeset -f mlibtoolize)   old_mlibtoolize=old$(typeset -f mlibtoolize)
    515   eval "${old_mlibtoolize}"   eval "${old_mlibtoolize}"
    516  fi  
    517  mlibtoolize()  mlibtoolize()
    518  {  {
    519   local abi   local abi
    # Line 363  mlibtoolize() Line 525  mlibtoolize()
    525   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    526   do   do
    527   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"
    528   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    529   oldmlibtoolize $@ || die   oldmlibtoolize $@ || die
    530   done   done
    531  }  }
    532    fi
    533    
    534    if [[ ! -z $(typeset -f mautoreconf) ]]
    535    then
    536     # rename the old one
    537     old_mautoreconf=old$(typeset -f mautoreconf)
    538     eval "${old_mautoreconf}"
    539    
    540    mautoreconf()
    541    {
    542     local abi
    543     local abis_to_run="${MULTILIB_ABIS}"
    544    
    545     # respect MULTILIB_ONLY_ABI variable
    546     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    547    
    548     for abi in ${abis_to_run}
    549     do
    550     echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"
    551     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    552     oldmautoreconf $@ || die
    553     done
    554    }
    555    fi
    556    
    557    if [[ ! -z $(typeset -f minstalldocs) ]]
    558    then
    559     # rename the old one
    560     old_minstalldocs=old$(typeset -f minstalldocs)
    561     eval "${old_minstalldocs}"
    562    
    563  minstalldocs()  minstalldocs()
    564  {  {
    565   local abi   local abi
    566   local docfiles   local docfiles
      docfiles="$@"  
    567    
    568   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    569    
    # Line 381  minstalldocs() Line 572  minstalldocs()
    572    
    573   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    574   do   do
    575   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    576   if [ ! -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} ]   oldminstalldocs $@ || die
      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  
    577   done   done
    578  }  }
    579    fi
    580    
    581  ##  ##
    582  # multilib mbuild wrappers  # multilib mbuild wrappers
    583  ##  ##
    584  multilib_src_prepare()  multilib_src_prepare()
    585  {  {
    586   munpack   munpack ${SRCFILE} || die
    587  }  }
    588    
    589  multilib_src_compile()  multilib_src_compile()
    590  {  {
    591   mconfigure   if [[ ! -z $(typeset -f cmake_src_compile) ]]
    592   mmake   then
    593     cmake_src_compile || die
    594     else
    595     mconfigure || die
    596     mmake || die
    597     fi
    598    }
    599    
    600    multilib_src_check()
    601    {
    602     if [[ ! -z $(typeset -f cmake_src_check) ]]
    603     then
    604     cmake_src_check || die
    605     else
    606     mmake -j1 -k check || die
    607     fi
    608  }  }
    609    
    610  multilib_src_install()  multilib_src_install()
    611  {  {
    612   minstall_destdir   if [[ ! -z $(typeset -f cmake_src_install) ]]
    613     then
    614     cmake_src_install || die
    615     else
    616     mmake DESTDIR=${BINDIR} install || die
    617     fi
    618    
    619   local i   local i
    620   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
    621   do   do
    622   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    623   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
    624   FAQ LICENSE NEWS README TODO   FAQ LICENSE NEWS README TODO
    625   do   do
    # Line 429  multilib_src_install() Line 631  multilib_src_install()
    631   done   done
    632  }  }
    633    
    634  export_inherits multilib src_prepare src_compile src_install  export_inherits multilib src_prepare src_compile src_check src_install
    Legend:
    Removed from v.5486  
    changed lines
      Added in v.22067