Magellan Linux

  • Back to homepage
    • /[smage]/trunk/include/multilib.sminc

    Diff of /trunk/include/multilib.sminc

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

    trunk/core/include/multilib.sminc revision 4782 by niro, Sun Dec 27 23:21:20 2009 UTC trunk/include/multilib.sminc revision 33339 by niro, Wed Jul 12 20:17:12 2023 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    # 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_SDEPENDS_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_SDEPENDS_x86_64"   SPECIAL_VARS="${SPECIAL_VARS} EMUL_LINUX_32_SDEPEND_x86_64"
    31   fi   fi
    32   ;;   ;;
    33   i*86)   i*86)
    # 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_SDEPENDS_\${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_SDEPENDS_\${ARCH/i*86/x86} | tr ';' '\n')"   $(marchsdepend EMUL_LINUX_32_SDEPEND)"
    52   fi   fi
    53  fi  fi
    54    
    # Line 45  fi Line 57  fi
    57  ##  ##
    58  mlibdir()  mlibdir()
    59  {  {
    60   local libdir=lib   local libdir="${ABI_DEFAULT_LIBDIR}"
    61   [[ ${ARCH} = x86_64 ]] && libdir=lib64   [[ ${ARCH} = i686 ]] && libdir="${ABI_X86_LIBDIR}"
    62     [[ ${ARCH} = x86_64 ]] && libdir="${ABI_X86_64_LIBDIR}"
    63   [[ -n ${ABI_LIBDIR} ]] && libdir="${ABI_LIBDIR}"   [[ -n ${ABI_LIBDIR} ]] && libdir="${ABI_LIBDIR}"
    64    
    65   echo "${libdir}"   echo "${libdir}"
    # Line 60  abi-m32() Line 73  abi-m32()
    73   export ABI="m32"   export ABI="m32"
    74   export CC="gcc -${ABI}"   export CC="gcc -${ABI}"
    75   export CXX="g++ -${ABI}"   export CXX="g++ -${ABI}"
    76   export ABI_LIBDIR="lib"   export ABI_LIBDIR="${ABI_X86_LIBDIR}"
    77   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    78   then   then
    79   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   local saved_ldflags="${LDFLAGS}"
    80     export LDFLAGS="${LDFLAGS} -L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    81   fi   fi
    82   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   # keep pkgconfig clean
    83     local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    84     export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    85    
    86     # honor rust
    87     case ${ARCH} in
    88     # use native abi as RUST_TARGET
    89     i686) export RUST_TARGET="${ARCH}-unknown-linux-gnu" ;;
    90     # use i686 as RUST_TARGET for i{3,4,5}86 targets and on multilib-x86_64 target too
    91     i*86|x86_64) export RUST_TARGET="i686-unknown-linux-gnu" ;;
    92     *)  die "unknown RUST_TARGET '${ARCH}'" ;;
    93     esac
    94    
    95   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 ]]  
    96   then   then
    97   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    98   else   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
    99   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
    100     echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
    101     echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
    102     if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    103     then
    104     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
    105     else
    106     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
    107     fi
    108     echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
    109     echo -e "${COLBLUE}*** ${COLGREEN}  RUST_TARGET${COLDEFAULT}='${RUST_TARGET}'"
    110     echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
    111     echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
    112   fi   fi
      echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"  
    113    
    114   # configure a linux32 emulated build   # configure a linux32 emulated build
    115   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    116   then   then
    117   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"   if [[ ${MULTILIB_VERBOSE} = true ]]
    118     then
    119     echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"
    120     fi
    121   uname(){ linux32 uname $@; } && export -f uname   uname(){ linux32 uname $@; } && export -f uname
    122   ORIG_CHOST="${CHOST}" && export CHOST="i686-pc-linux-gnu"   local orig_chost="${CHOST}" && export CHOST="${ABI_X86_CHOST}"
    123     fi
    124     if [[ ${MULTILIB_VERBOSE} = true ]]
    125     then
    126     echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
    127   fi   fi
      echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"  
    128    
    129   # run any given command   # run any given command
    130     if [[ ${MULTILIB_VERBOSE} = true ]]
    131     then
    132     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    133     fi
    134   eval $@ || die   eval $@ || die
    135    
    136   unset ABI CC CXX ABI_LIBDIR LDFLAGS PKG_CONFIG_PATH   unset ABI CC CXX ABI_LIBDIR RUST_TARGET
    137     # keep pkgconfig clean
    138     export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    139     export LDFLAGS="${saved_ldflags}"
    140    
    141   # restore original settings   # restore original settings
    142   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    143   then   then
    144   unset uname   unset uname
    145   export CHOST="${ORIG_CHOST}" && unset ORIG_CHOST   export CHOST="${orig_chost}" && unset orig_chost
    146   fi   fi
    147  }  }
    148    
    # Line 107  abi-m64() Line 151  abi-m64()
    151   export ABI="m64"   export ABI="m64"
    152   export CC="gcc -${ABI}"   export CC="gcc -${ABI}"
    153   export CXX="g++ -${ABI}"   export CXX="g++ -${ABI}"
    154   export ABI_LIBDIR="lib64"   export ABI_LIBDIR="${ABI_X86_64_LIBDIR}"
    155   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    156   then   then
    157     local saved_ldflags="${LDFLAGS}"
    158   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    159   fi   fi
    160   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   # keep pkgconfig clean
    161     local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    162     export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    163    
    164     # honor rust
    165     case ${ARCH} in
    166     # use native abi as RUST_TARGET
    167     x86_64) export RUST_TARGET="${ARCH}-unknown-linux-gnu" ;;
    168     *)  die "unknown RUST_TARGET '${ARCH}'" ;;
    169     esac
    170    
    171   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 ]]  
    172   then   then
    173   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    174   else   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
    175   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
    176     echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
    177     echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
    178     if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    179     then
    180     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
    181     else
    182     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
    183     fi
    184     echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
    185     echo -e "${COLBLUE}*** ${COLGREEN}  RUST_TARGET${COLDEFAULT}='${RUST_TARGET}'"
    186     echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
    187     echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
    188   fi   fi
      echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"  
      echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"  
    189    
    190   # run any given command   # run any given command
    191     if [[ ${MULTILIB_VERBOSE} = true ]]
    192     then
    193     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    194     fi
    195   eval $@ || die   eval $@ || die
    196    
    197   unset ABI CC CXX ABI_LIBDIR LDFLAGS PKG_CONFIG_PATH   unset ABI CC CXX ABI_LIBDIR RUST_TARGET
    198     # keep pkgconfig clean
    199     export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    200     export LDFLAGS="${saved_ldflags}"
    201  }  }
    202    
    203  only-m32()  only-m32()
    # Line 146  only-m32() Line 212  only-m32()
    212   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    213   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    214    
    215   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    216     then
    217     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    218     fi
    219   abi-${abi} $@ || die   abi-${abi} $@ || die
    220    
    221   # unset this is very important   # unset this is very important
    # Line 167  only-m64() Line 236  only-m64()
    236   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    237   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    238    
    239   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    240     then
    241     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    242     fi
    243   abi-${abi} $@ || die   abi-${abi} $@ || die
    244    
    245   # unset this is very important   # unset this is very important
    # Line 181  all-abis() Line 253  all-abis()
    253   local abi   local abi
    254   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
    255   do   do
    256   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    257     then
    258     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    259     fi
    260   abi-${abi} $@ || die   abi-${abi} $@ || die
    261   done   done
    262  }  }
    263    
    264    mabi()
    265    {
    266     echo \${ABI}
    267    }
    268    
    269    mabi-cc()
    270    {
    271     echo "gcc -\${ABI}"
    272    }
    273    
    274    mabi-cxx()
    275    {
    276     echo "g++ -\${ABI}"
    277    }
    278    
    279    mabi-cflags()
    280    {
    281     echo "\${CFLAGS}"
    282    }
    283    
    284    mabi-cxxflags()
    285    {
    286     echo "\${CXXFLAGS}"
    287    }
    288    
    289    mabi-ldflags()
    290    {
    291     echo "\${LDFLAGS}"
    292    }
    293    
    294  ##  ##
    295  # multilib compile functions  # multilib compile functions
    296  ##  ##
    # Line 194  if [[ ! -z $(typeset -f mconfigure) ]] Line 299  if [[ ! -z $(typeset -f mconfigure) ]]
    299  then  then
    300   # rename the old one   # rename the old one
    301   old_mconfigure=old$(typeset -f mconfigure)   old_mconfigure=old$(typeset -f mconfigure)
    302   eval ${old_mconfigure}   eval "${old_mconfigure}"
    303  fi  
    304  mconfigure()  mconfigure()
    305  {  {
    306   local abi   local abi
    # Line 206  mconfigure() Line 311  mconfigure()
    311    
    312   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    313   do   do
    314   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    315     then
    316     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    317     fi
    318   abi-${abi} oldmconfigure $@ || die   abi-${abi} oldmconfigure $@ || die
    319   done   done
    320  }  }
       
     if [[ ! -z $(typeset -f cmake_configure) ]]  
     then  
      # rename the old one  
      old_cmake_configure=old$(typeset -f cmake_configure)  
      eval ${old_cmake_configure}  
    321  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  
     }  
    322    
    323  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
    324  then  then
    325   # rename the old one   # rename the old one
    326   old_munpack=old$(typeset -f munpack)   old_munpack=old$(typeset -f munpack)
    327   eval "${old_munpack}"   eval "${old_munpack}"
    328  fi  
    329  munpack()  munpack()
    330  {  {
    331   local abi   local abi
    # Line 251  munpack() Line 337  munpack()
    337   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    338   do   do
    339   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
    340   oldmunpack ${SRCFILE} || die   oldmunpack $@ || die
    341   mv ${SRCDIR} ${SRCDIR}-${abi} || die   mv ${SRCDIR} ${SRCDIR}-${abi} || die
    342   done   done
    343  }  }
    344    fi
    345    
    346  if [[ ! -z $(typeset -f mmake) ]]  if [[ ! -z $(typeset -f mmake) ]]
    347  then  then
    348   # rename the old one   # rename the old one
    349   old_mmake=old$(typeset -f mmake)   old_mmake=old$(typeset -f mmake)
    350   eval "${old_mmake}"   eval "${old_mmake}"
    351  fi  
    352  mmake()  mmake()
    353  {  {
    354   local abi   local abi
    # Line 273  mmake() Line 360  mmake()
    360   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    361   do   do
    362   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"
    363   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    364     then
    365     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    366     fi
    367   abi-${abi} oldmmake $@ || die   abi-${abi} oldmmake $@ || die
    368   done   done
    369  }  }
    370    fi
    371    
    372  if [[ ! -z $(typeset -f minstall) ]]  if [[ ! -z $(typeset -f minstall) ]]
    373  then  then
    374   # rename the old one   # rename the old one
    375   old_minstall=old$(typeset -f minstall)   old_minstall=old$(typeset -f minstall)
    376   eval "${old_minstall}"   eval "${old_minstall}"
    377  fi  
    378  minstall()  minstall()
    379  {  {
    380   local abi   local abi
    # Line 295  minstall() Line 386  minstall()
    386   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    387   do   do
    388   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    389   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    390     then
    391     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    392     fi
    393   abi-${abi} oldminstall $@ || die   abi-${abi} oldminstall $@ || die
    394   done   done
    395  }  }
    396    fi
    397    
    398  minstall_destdir()  minstall_destdir()
    399  {  {
    # Line 311  minstall_destdir() Line 406  minstall_destdir()
    406   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    407   do   do
    408   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    409   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    410     then
    411     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    412     fi
    413   make DESTDIR=${BINDIR} $@ install || die   make DESTDIR=${BINDIR} $@ install || die
    414   done   done
    415  }  }
    # Line 321  then Line 419  then
    419   # rename the old one   # rename the old one
    420   old_mpatch=old$(typeset -f mpatch)   old_mpatch=old$(typeset -f mpatch)
    421   eval "${old_mpatch}"   eval "${old_mpatch}"
    422  fi  
    423  mpatch()  mpatch()
    424  {  {
    425   local abi   local abi
    # Line 333  mpatch() Line 431  mpatch()
    431   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    432   do   do
    433   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"
    434   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    435     then
    436     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    437     fi
    438   oldmpatch $@ || die   oldmpatch $@ || die
    439   done   done
    440  }  }
    441    fi
    442    
    443  if [[ ! -z $(typeset -f mlibtoolize) ]]  if [[ ! -z $(typeset -f mlibtoolize) ]]
    444  then  then
    445   # rename the old one   # rename the old one
    446   old_mlibtoolize=old$(typeset -f mlibtoolize)   old_mlibtoolize=old$(typeset -f mlibtoolize)
    447   eval "${old_mlibtoolize}"   eval "${old_mlibtoolize}"
    448  fi  
    449  mlibtoolize()  mlibtoolize()
    450  {  {
    451   local abi   local abi
    # Line 355  mlibtoolize() Line 457  mlibtoolize()
    457   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    458   do   do
    459   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"
    460   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    461     then
    462     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    463     fi
    464   oldmlibtoolize $@ || die   oldmlibtoolize $@ || die
    465   done   done
    466  }  }
    467    fi
    468    
    469  minstalldocs()  if [[ ! -z $(typeset -f mautoreconf) ]]
    470    then
    471     # rename the old one
    472     old_mautoreconf=old$(typeset -f mautoreconf)
    473     eval "${old_mautoreconf}"
    474    
    475    mautoreconf()
    476  {  {
    477   local abi   local abi
      local docfiles  
      docfiles="$@"  
       
    478   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    479    
    480   # respect MULTILIB_ONLY_ABI variable   # respect MULTILIB_ONLY_ABI variable
    # Line 373  minstalldocs() Line 482  minstalldocs()
    482    
    483   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    484   do   do
    485   cd ${SRCDIR}-${abi}   echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"
    486   if [ ! -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} ]   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    487   then   then
    488   install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs."   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    489   fi   fi
    490     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  
    491   done   done
    492  }  }
    493    fi
    494    
    495  ##  if [[ ! -z $(typeset -f minstalldocs) ]]
    496  # multilib mbuild wrappers  then
    497  ##   # rename the old one
    498  multilib_src_prepare()   old_minstalldocs=old$(typeset -f minstalldocs)
    499  {   eval "${old_minstalldocs}"
      munpack  
     }  
    500    
    501  multilib_src_compile()  minstalldocs()
    502  {  {
    503   mconfigure   local abi
    504   mmake   local docfiles
     }  
    505    
    506  multilib_src_install()   local abis_to_run="${MULTILIB_ABIS}"
     {  
      minstall_destdir  
    507    
    508   local i   # respect MULTILIB_ONLY_ABI variable
    509   for abi in ${MULTILIB_ABIS}   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    510    
    511     for abi in ${abis_to_run}
    512   do   do
    513   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    514   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   then
    515   FAQ LICENSE NEWS README TODO   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    516   do   fi
    517   if [ -f ${SRCDIR}-${abi}/${i} ]   oldminstalldocs $@ || die
      then  
      minstalldocs ${i} || die  
      fi  
      done  
    518   done   done
    519  }  }
    520    fi
     export_inherits multilib src_prepare src_compile src_install  
    Legend:
    Removed from v.4782  
    changed lines
      Added in v.33339