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 6406 by niro, Mon Aug 23 11:25:26 2010 UTC trunk/include/multilib.sminc revision 31852 by niro, Thu Dec 20 13:40:54 2018 UTC
    # Line 1  Line 1 
    1  # $Id$  # $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    # enter the abi srcdir as default setting
    11    : ${MULTILIB_ENTER_SRCDIR="true"}
    12    
    13    # multilib should call all dependant includes, which gets overridden
    14    sminclude mtools
    15    
    16  # do not define EMUL_LINUX_32 after inherit of multlib !!  # do not define EMUL_LINUX_32 after inherit of multlib !!
    17  # it may break i*86 builds  # it may break i*86 builds
    18    
    # Line 14  case ${ARCH} in Line 26  case ${ARCH} in
    26   # add linux32 to the dependencies   # add linux32 to the dependencies
    27   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    28   then   then
    29   EMUL_LINUX_32_SDEPEND_x86_64=">= dev-util/linux32-1"   EMUL_LINUX_32_SDEPEND_x86_64=">= sys-apps/util-linux-2.19"
    30   SPECIAL_VARS="${SPECIAL_VARS} EMUL_LINUX_32_SDEPEND_x86_64"   SPECIAL_VARS="${SPECIAL_VARS} EMUL_LINUX_32_SDEPEND_x86_64"
    31   fi   fi
    32   ;;   ;;
    # Line 33  then Line 45  then
    45   # the var ist decided with our common eval+echo magic   # the var ist decided with our common eval+echo magic
    46   if [[ -z ${SDEPEND} ]]   if [[ -z ${SDEPEND} ]]
    47   then   then
    48   SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   SDEPEND="$(marchsdepend EMUL_LINUX_32_SDEPEND)"
    49   else   else
    50   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
    51   \$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   $(marchsdepend EMUL_LINUX_32_SDEPEND)"
    52   fi   fi
    53  fi  fi
    54    
    # Line 63  abi-m32() Line 75  abi-m32()
    75   export ABI_LIBDIR="lib"   export ABI_LIBDIR="lib"
    76   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    77   then   then
    78   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   local saved_ldflags="${LDFLAGS}"
    79     export LDFLAGS="${LDFLAGS} -L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    80   fi   fi
    81   # keep pkgconfig clean   # keep pkgconfig clean
    82   local orig_pkg_config_path="${PKG_CONFIG_PATH}"   local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    83   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    84    
    85   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   # honor rust
    86   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"   case ${ARCH} in
    87   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"   # use native abi as RUST_TARGET
    88   echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"   i686) export RUST_TARGET="${ARCH}-unknown-linux-gnu" ;;
    89   echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"   # use i686 as RUST_TARGET for i{3,4,5}86 targets and on multilib-x86_64 target too
    90   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   i*86|x86_64) export RUST_TARGET="i686-unknown-linux-gnu" ;;
    91     *)  die "unknown RUST_TARGET '${ARCH}'" ;;
    92     esac
    93    
    94     if [[ ${MULTILIB_VERBOSE} = true ]]
    95   then   then
    96   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    97   else   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
    98   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
    99     echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
    100     echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
    101     if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    102     then
    103     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
    104     else
    105     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
    106     fi
    107     echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
    108     echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
    109     echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
    110   fi   fi
      echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"  
    111    
    112   # configure a linux32 emulated build   # configure a linux32 emulated build
    113   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    114   then   then
    115   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"   if [[ ${MULTILIB_VERBOSE} = true ]]
    116     then
    117     echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"
    118     fi
    119   uname(){ linux32 uname $@; } && export -f uname   uname(){ linux32 uname $@; } && export -f uname
    120   ORIG_CHOST="${CHOST}" && export CHOST="i686-pc-linux-gnu"   local orig_chost="${CHOST}" && export CHOST="i686-pc-linux-gnu"
    121     fi
    122     if [[ ${MULTILIB_VERBOSE} = true ]]
    123     then
    124     echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
    125   fi   fi
      echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"  
    126    
    127   # run any given command   # run any given command
    128     if [[ ${MULTILIB_VERBOSE} = true ]]
    129     then
    130     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    131     fi
    132   eval $@ || die   eval $@ || die
    133    
    134   unset ABI CC CXX ABI_LIBDIR LDFLAGS   unset ABI CC CXX ABI_LIBDIR RUST_TARGET
    135   # keep pkgconfig clean   # keep pkgconfig clean
    136   export PKG_CONFIG_PATH="${orig_pkg_config_path}"   export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    137     export LDFLAGS="${saved_ldflags}"
    138    
    139   # restore original settings   # restore original settings
    140   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    141   then   then
    142   unset uname   unset uname
    143   export CHOST="${ORIG_CHOST}" && unset ORIG_CHOST   export CHOST="${orig_chost}" && unset orig_chost
    144   fi   fi
    145  }  }
    146    
    # Line 114  abi-m64() Line 152  abi-m64()
    152   export ABI_LIBDIR="lib64"   export ABI_LIBDIR="lib64"
    153   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    154   then   then
    155     local saved_ldflags="${LDFLAGS}"
    156   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    157   fi   fi
    158   # keep pkgconfig clean   # keep pkgconfig clean
    159   local orig_pkg_config_path="${PKG_CONFIG_PATH}"   local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    160   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    161    
    162   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   # honor rust
    163   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"   case ${ARCH} in
    164   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"   # use native abi as RUST_TARGET
    165   echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"   x86_64) export RUST_TARGET="${ARCH}-unknown-linux-gnu" ;;
    166   echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"   *)  die "unknown RUST_TARGET '${ARCH}'" ;;
    167   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   esac
    168    
    169     if [[ ${MULTILIB_VERBOSE} = true ]]
    170   then   then
    171   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    172   else   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
    173   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
    174     echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
    175     echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
    176     if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    177     then
    178     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
    179     else
    180     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
    181     fi
    182     echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
    183     echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
    184     echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
    185   fi   fi
      echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"  
      echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"  
    186    
    187   # run any given command   # run any given command
    188     if [[ ${MULTILIB_VERBOSE} = true ]]
    189     then
    190     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    191     fi
    192   eval $@ || die   eval $@ || die
    193    
    194   unset ABI CC CXX ABI_LIBDIR LDFLAGS   unset ABI CC CXX ABI_LIBDIR RUST_TARGET
    195   # keep pkgconfig clean   # keep pkgconfig clean
    196   export PKG_CONFIG_PATH="${orig_pkg_config_path}"   export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    197     export LDFLAGS="${saved_ldflags}"
    198  }  }
    199    
    200  only-m32()  only-m32()
    # Line 154  only-m32() Line 209  only-m32()
    209   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    210   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    211    
    212   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    213     then
    214     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    215     fi
    216   abi-${abi} $@ || die   abi-${abi} $@ || die
    217    
    218   # unset this is very important   # unset this is very important
    # Line 175  only-m64() Line 233  only-m64()
    233   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    234   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    235    
    236   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    237     then
    238     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    239     fi
    240   abi-${abi} $@ || die   abi-${abi} $@ || die
    241    
    242   # unset this is very important   # unset this is very important
    # Line 189  all-abis() Line 250  all-abis()
    250   local abi   local abi
    251   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
    252   do   do
    253   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    254     then
    255     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    256     fi
    257   abi-${abi} $@ || die   abi-${abi} $@ || die
    258   done   done
    259  }  }
    # Line 199  mabi() Line 263  mabi()
    263   echo \${ABI}   echo \${ABI}
    264  }  }
    265    
    266    mabi-cc()
    267    {
    268     echo "gcc -\${ABI}"
    269    }
    270    
    271    mabi-cxx()
    272    {
    273     echo "g++ -\${ABI}"
    274    }
    275    
    276    mabi-cflags()
    277    {
    278     echo "\${CFLAGS}"
    279    }
    280    
    281    mabi-cxxflags()
    282    {
    283     echo "\${CXXFLAGS}"
    284    }
    285    
    286    mabi-ldflags()
    287    {
    288     echo "\${LDFLAGS}"
    289    }
    290    
    291  ##  ##
    292  # multilib compile functions  # multilib compile functions
    293  ##  ##
    # Line 208  then Line 297  then
    297   # rename the old one   # rename the old one
    298   old_mconfigure=old$(typeset -f mconfigure)   old_mconfigure=old$(typeset -f mconfigure)
    299   eval "${old_mconfigure}"   eval "${old_mconfigure}"
    300  fi  
    301  mconfigure()  mconfigure()
    302  {  {
    303   local abi   local abi
    # Line 219  mconfigure() Line 308  mconfigure()
    308    
    309   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    310   do   do
    311   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    312     then
    313     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    314     fi
    315   abi-${abi} oldmconfigure $@ || die   abi-${abi} oldmconfigure $@ || die
    316   done   done
    317  }  }
       
     if [[ ! -z $(typeset -f cmake_configure) ]]  
     then  
      # rename the old one  
      old_cmake_configure=old$(typeset -f cmake_configure)  
      eval "${old_cmake_configure}"  
    318  fi  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  
     }  
    319    
    320  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
    321  then  then
    322   # rename the old one   # rename the old one
    323   old_munpack=old$(typeset -f munpack)   old_munpack=old$(typeset -f munpack)
    324   eval "${old_munpack}"   eval "${old_munpack}"
    325  fi  
    326  munpack()  munpack()
    327  {  {
    328   local abi   local abi
    # Line 264  munpack() Line 334  munpack()
    334   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    335   do   do
    336   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
    337   oldmunpack ${SRCFILE} || die   oldmunpack $@ || die
    338   mv ${SRCDIR} ${SRCDIR}-${abi} || die   mv ${SRCDIR} ${SRCDIR}-${abi} || die
    339   done   done
    340  }  }
    341    fi
    342    
    343  if [[ ! -z $(typeset -f mmake) ]]  if [[ ! -z $(typeset -f mmake) ]]
    344  then  then
    345   # rename the old one   # rename the old one
    346   old_mmake=old$(typeset -f mmake)   old_mmake=old$(typeset -f mmake)
    347   eval "${old_mmake}"   eval "${old_mmake}"
    348  fi  
    349  mmake()  mmake()
    350  {  {
    351   local abi   local abi
    # Line 286  mmake() Line 357  mmake()
    357   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    358   do   do
    359   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"
    360   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    361     then
    362     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    363     fi
    364   abi-${abi} oldmmake $@ || die   abi-${abi} oldmmake $@ || die
    365   done   done
    366  }  }
    367    fi
    368    
    369  if [[ ! -z $(typeset -f minstall) ]]  if [[ ! -z $(typeset -f minstall) ]]
    370  then  then
    371   # rename the old one   # rename the old one
    372   old_minstall=old$(typeset -f minstall)   old_minstall=old$(typeset -f minstall)
    373   eval "${old_minstall}"   eval "${old_minstall}"
    374  fi  
    375  minstall()  minstall()
    376  {  {
    377   local abi   local abi
    # Line 308  minstall() Line 383  minstall()
    383   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    384   do   do
    385   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    386   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    387     then
    388     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    389     fi
    390   abi-${abi} oldminstall $@ || die   abi-${abi} oldminstall $@ || die
    391   done   done
    392  }  }
    393    fi
    394    
    395  minstall_destdir()  minstall_destdir()
    396  {  {
    # Line 324  minstall_destdir() Line 403  minstall_destdir()
    403   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    404   do   do
    405   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    406   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    407     then
    408     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    409     fi
    410   make DESTDIR=${BINDIR} $@ install || die   make DESTDIR=${BINDIR} $@ install || die
    411   done   done
    412  }  }
    # Line 334  then Line 416  then
    416   # rename the old one   # rename the old one
    417   old_mpatch=old$(typeset -f mpatch)   old_mpatch=old$(typeset -f mpatch)
    418   eval "${old_mpatch}"   eval "${old_mpatch}"
    419  fi  
    420  mpatch()  mpatch()
    421  {  {
    422   local abi   local abi
    # Line 346  mpatch() Line 428  mpatch()
    428   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    429   do   do
    430   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"
    431   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    432     then
    433     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    434     fi
    435   oldmpatch $@ || die   oldmpatch $@ || die
    436   done   done
    437  }  }
    438    fi
    439    
    440  if [[ ! -z $(typeset -f mlibtoolize) ]]  if [[ ! -z $(typeset -f mlibtoolize) ]]
    441  then  then
    442   # rename the old one   # rename the old one
    443   old_mlibtoolize=old$(typeset -f mlibtoolize)   old_mlibtoolize=old$(typeset -f mlibtoolize)
    444   eval "${old_mlibtoolize}"   eval "${old_mlibtoolize}"
    445  fi  
    446  mlibtoolize()  mlibtoolize()
    447  {  {
    448   local abi   local abi
    # Line 368  mlibtoolize() Line 454  mlibtoolize()
    454   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    455   do   do
    456   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"
    457   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    458     then
    459     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    460     fi
    461   oldmlibtoolize $@ || die   oldmlibtoolize $@ || die
    462   done   done
    463  }  }
    464    fi
    465    
    466  minstalldocs()  if [[ ! -z $(typeset -f mautoreconf) ]]
    467    then
    468     # rename the old one
    469     old_mautoreconf=old$(typeset -f mautoreconf)
    470     eval "${old_mautoreconf}"
    471    
    472    mautoreconf()
    473  {  {
    474   local abi   local abi
      local docfiles  
      docfiles="$@"  
       
    475   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    476    
    477   # respect MULTILIB_ONLY_ABI variable   # respect MULTILIB_ONLY_ABI variable
    # Line 386  minstalldocs() Line 479  minstalldocs()
    479    
    480   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    481   do   do
    482   cd ${SRCDIR}-${abi}   echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"
    483   if [ ! -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} ]   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    484   then   then
    485   install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs."   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    486   fi   fi
    487     oldmautoreconf $@ || die
      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  
    488   done   done
    489  }  }
    490    fi
    491    
    492  ##  if [[ ! -z $(typeset -f minstalldocs) ]]
    493  # multilib mbuild wrappers  then
    494  ##   # rename the old one
    495  multilib_src_prepare()   old_minstalldocs=old$(typeset -f minstalldocs)
    496  {   eval "${old_minstalldocs}"
      munpack  
     }  
    497    
    498  multilib_src_compile()  minstalldocs()
    499  {  {
    500   mconfigure   local abi
    501   mmake   local docfiles
     }  
    502    
    503  multilib_src_install()   local abis_to_run="${MULTILIB_ABIS}"
     {  
      minstall_destdir  
    504    
    505   local i   # respect MULTILIB_ONLY_ABI variable
    506   for abi in ${MULTILIB_ABIS}   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    507    
    508     for abi in ${abis_to_run}
    509   do   do
    510   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    511   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   then
    512   FAQ LICENSE NEWS README TODO   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    513   do   fi
    514   if [ -f ${SRCDIR}-${abi}/${i} ]   oldminstalldocs $@ || die
      then  
      minstalldocs ${i} || die  
      fi  
      done  
    515   done   done
    516  }  }
    517    fi
     export_inherits multilib src_prepare src_compile src_install  
    Legend:
    Removed from v.6406  
    changed lines
      Added in v.31852