Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/branches/alx07x-unstable/include/multilib.sminc

    Diff of /smage/branches/alx07x-unstable/include/multilib.sminc

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

    revision 2792 by niro, Mon Aug 29 20:03:18 2011 UTC revision 13784 by niro, Wed Oct 30 13:18:04 2019 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}  RUST_TARGET${COLDEFAULT}='${RUST_TARGET}'"
    109     echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
    110     echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
    111   fi   fi
      echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"  
    112    
    113   # configure a linux32 emulated build   # configure a linux32 emulated build
    114   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    115   then   then
    116   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"   if [[ ${MULTILIB_VERBOSE} = true ]]
    117     then
    118     echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"
    119     fi
    120   uname(){ linux32 uname $@; } && export -f uname   uname(){ linux32 uname $@; } && export -f uname
    121   ORIG_CHOST="${CHOST}" && export CHOST="i686-pc-linux-gnu"   local orig_chost="${CHOST}" && export CHOST="i686-pc-linux-gnu"
    122     fi
    123     if [[ ${MULTILIB_VERBOSE} = true ]]
    124     then
    125     echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
    126   fi   fi
      echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"  
    127    
    128   # run any given command   # run any given command
    129     if [[ ${MULTILIB_VERBOSE} = true ]]
    130     then
    131     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    132     fi
    133   eval $@ || die   eval $@ || die
    134    
    135   unset ABI CC CXX ABI_LIBDIR LDFLAGS   unset ABI CC CXX ABI_LIBDIR RUST_TARGET
    136   # keep pkgconfig clean   # keep pkgconfig clean
    137   export PKG_CONFIG_PATH="${orig_pkg_config_path}"   export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    138     export LDFLAGS="${saved_ldflags}"
    139    
    140   # restore original settings   # restore original settings
    141   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    142   then   then
    143   unset uname   unset uname
    144   export CHOST="${ORIG_CHOST}" && unset ORIG_CHOST   export CHOST="${orig_chost}" && unset orig_chost
    145   fi   fi
    146  }  }
    147    
    # Line 114  abi-m64() Line 153  abi-m64()
    153   export ABI_LIBDIR="lib64"   export ABI_LIBDIR="lib64"
    154   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    155   then   then
    156     local saved_ldflags="${LDFLAGS}"
    157   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    158   fi   fi
    159   # keep pkgconfig clean   # keep pkgconfig clean
    160   local orig_pkg_config_path="${PKG_CONFIG_PATH}"   local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    161   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    162    
    163   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   # honor rust
    164   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"   case ${ARCH} in
    165   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"   # use native abi as RUST_TARGET
    166   echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"   x86_64) export RUST_TARGET="${ARCH}-unknown-linux-gnu" ;;
    167   echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"   *)  die "unknown RUST_TARGET '${ARCH}'" ;;
    168   if [[ ${EXPORT_ABI_LDFLAGS} != false ]]   esac
    169    
    170     if [[ ${MULTILIB_VERBOSE} = true ]]
    171   then   then
    172   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    173   else   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
    174   echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"   echo -e "${COLBLUE}*** ${COLGREEN}  CC${COLDEFAULT}='${CC}'"
    175     echo -e "${COLBLUE}*** ${COLGREEN}  CXX${COLDEFAULT}='${CXX}'"
    176     echo -e "${COLBLUE}*** ${COLGREEN}  ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'"
    177     if [[ ${EXPORT_ABI_LDFLAGS} != false ]]
    178     then
    179     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${LDFLAGS}'"
    180     else
    181     echo -e "${COLBLUE}*** ${COLGREEN}  LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'"
    182     fi
    183     echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"
    184     echo -e "${COLBLUE}*** ${COLGREEN}  RUST_TARGET${COLDEFAULT}='${RUST_TARGET}'"
    185     echo -e "${COLBLUE}*** ${COLGREEN}  SRCDIR${COLDEFAULT}='${SRCDIR}/${SRCSUBDIR}'"
    186     echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"
    187   fi   fi
      echo -e "${COLBLUE}*** ${COLGREEN}  CHOST${COLDEFAULT}='${CHOST}'"  
      echo -e "${COLBLUE}*** ${COLGREEN}  PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"  
    188    
    189   # run any given command   # run any given command
    190     if [[ ${MULTILIB_VERBOSE} = true ]]
    191     then
    192     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
    193     fi
    194   eval $@ || die   eval $@ || die
    195    
    196   unset ABI CC CXX ABI_LIBDIR LDFLAGS   unset ABI CC CXX ABI_LIBDIR RUST_TARGET
    197   # keep pkgconfig clean   # keep pkgconfig clean
    198   export PKG_CONFIG_PATH="${orig_pkg_config_path}"   export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    199     export LDFLAGS="${saved_ldflags}"
    200  }  }
    201    
    202  only-m32()  only-m32()
    # Line 154  only-m32() Line 211  only-m32()
    211   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    212   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    213    
    214   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    215     then
    216     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    217     fi
    218   abi-${abi} $@ || die   abi-${abi} $@ || die
    219    
    220   # unset this is very important   # unset this is very important
    # Line 175  only-m64() Line 235  only-m64()
    235   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
    236   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
    237    
    238   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    239     then
    240     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    241     fi
    242   abi-${abi} $@ || die   abi-${abi} $@ || die
    243    
    244   # unset this is very important   # unset this is very important
    # Line 189  all-abis() Line 252  all-abis()
    252   local abi   local abi
    253   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
    254   do   do
    255   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    256     then
    257     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    258     fi
    259   abi-${abi} $@ || die   abi-${abi} $@ || die
    260   done   done
    261  }  }
    # Line 199  mabi() Line 265  mabi()
    265   echo \${ABI}   echo \${ABI}
    266  }  }
    267    
    268    mabi-cc()
    269    {
    270     echo "gcc -\${ABI}"
    271    }
    272    
    273    mabi-cxx()
    274    {
    275     echo "g++ -\${ABI}"
    276    }
    277    
    278    mabi-cflags()
    279    {
    280     echo "\${CFLAGS}"
    281    }
    282    
    283    mabi-cxxflags()
    284    {
    285     echo "\${CXXFLAGS}"
    286    }
    287    
    288    mabi-ldflags()
    289    {
    290     echo "\${LDFLAGS}"
    291    }
    292    
    293  ##  ##
    294  # multilib compile functions  # multilib compile functions
    295  ##  ##
    # Line 208  then Line 299  then
    299   # rename the old one   # rename the old one
    300   old_mconfigure=old$(typeset -f mconfigure)   old_mconfigure=old$(typeset -f mconfigure)
    301   eval "${old_mconfigure}"   eval "${old_mconfigure}"
    302  fi  
    303  mconfigure()  mconfigure()
    304  {  {
    305   local abi   local abi
    # Line 219  mconfigure() Line 310  mconfigure()
    310    
    311   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    312   do   do
    313   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    314     then
    315     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    316     fi
    317   abi-${abi} oldmconfigure $@ || die   abi-${abi} oldmconfigure $@ || die
    318   done   done
    319  }  }
       
     if [[ ! -z $(typeset -f cmake_configure) ]]  
     then  
      # rename the old one  
      old_cmake_configure=old$(typeset -f cmake_configure)  
      eval "${old_cmake_configure}"  
    320  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  
     }  
    321    
    322  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
    323  then  then
    324   # rename the old one   # rename the old one
    325   old_munpack=old$(typeset -f munpack)   old_munpack=old$(typeset -f munpack)
    326   eval "${old_munpack}"   eval "${old_munpack}"
    327  fi  
    328  munpack()  munpack()
    329  {  {
    330   local abi   local abi
    # Line 264  munpack() Line 336  munpack()
    336   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    337   do   do
    338   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
    339   oldmunpack ${SRCFILE} || die   oldmunpack $@ || die
    340   mv ${SRCDIR} ${SRCDIR}-${abi} || die   mv ${SRCDIR} ${SRCDIR}-${abi} || die
    341   done   done
    342  }  }
    343    fi
    344    
    345  if [[ ! -z $(typeset -f mmake) ]]  if [[ ! -z $(typeset -f mmake) ]]
    346  then  then
    347   # rename the old one   # rename the old one
    348   old_mmake=old$(typeset -f mmake)   old_mmake=old$(typeset -f mmake)
    349   eval "${old_mmake}"   eval "${old_mmake}"
    350  fi  
    351  mmake()  mmake()
    352  {  {
    353   local abi   local abi
    # Line 286  mmake() Line 359  mmake()
    359   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    360   do   do
    361   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"
    362   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    363     then
    364     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    365     fi
    366   abi-${abi} oldmmake $@ || die   abi-${abi} oldmmake $@ || die
    367   done   done
    368  }  }
    369    fi
    370    
    371  if [[ ! -z $(typeset -f minstall) ]]  if [[ ! -z $(typeset -f minstall) ]]
    372  then  then
    373   # rename the old one   # rename the old one
    374   old_minstall=old$(typeset -f minstall)   old_minstall=old$(typeset -f minstall)
    375   eval "${old_minstall}"   eval "${old_minstall}"
    376  fi  
    377  minstall()  minstall()
    378  {  {
    379   local abi   local abi
    # Line 308  minstall() Line 385  minstall()
    385   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    386   do   do
    387   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    388   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    389     then
    390     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    391     fi
    392   abi-${abi} oldminstall $@ || die   abi-${abi} oldminstall $@ || die
    393   done   done
    394  }  }
    395    fi
    396    
    397  minstall_destdir()  minstall_destdir()
    398  {  {
    # Line 324  minstall_destdir() Line 405  minstall_destdir()
    405   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    406   do   do
    407   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    408   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    409     then
    410     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    411     fi
    412   make DESTDIR=${BINDIR} $@ install || die   make DESTDIR=${BINDIR} $@ install || die
    413   done   done
    414  }  }
    # Line 334  then Line 418  then
    418   # rename the old one   # rename the old one
    419   old_mpatch=old$(typeset -f mpatch)   old_mpatch=old$(typeset -f mpatch)
    420   eval "${old_mpatch}"   eval "${old_mpatch}"
    421  fi  
    422  mpatch()  mpatch()
    423  {  {
    424   local abi   local abi
    # Line 346  mpatch() Line 430  mpatch()
    430   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    431   do   do
    432   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"
    433   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    434     then
    435     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    436     fi
    437   oldmpatch $@ || die   oldmpatch $@ || die
    438   done   done
    439  }  }
    440    fi
    441    
    442  if [[ ! -z $(typeset -f mlibtoolize) ]]  if [[ ! -z $(typeset -f mlibtoolize) ]]
    443  then  then
    444   # rename the old one   # rename the old one
    445   old_mlibtoolize=old$(typeset -f mlibtoolize)   old_mlibtoolize=old$(typeset -f mlibtoolize)
    446   eval "${old_mlibtoolize}"   eval "${old_mlibtoolize}"
    447  fi  
    448  mlibtoolize()  mlibtoolize()
    449  {  {
    450   local abi   local abi
    # Line 368  mlibtoolize() Line 456  mlibtoolize()
    456   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    457   do   do
    458   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"
    459   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    460     then
    461     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    462     fi
    463   oldmlibtoolize $@ || die   oldmlibtoolize $@ || die
    464   done   done
    465  }  }
    466    fi
    467    
    468  minstalldocs()  if [[ ! -z $(typeset -f mautoreconf) ]]
    469    then
    470     # rename the old one
    471     old_mautoreconf=old$(typeset -f mautoreconf)
    472     eval "${old_mautoreconf}"
    473    
    474    mautoreconf()
    475  {  {
    476   local abi   local abi
      local docfiles  
      docfiles="$@"  
       
    477   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    478    
    479   # respect MULTILIB_ONLY_ABI variable   # respect MULTILIB_ONLY_ABI variable
    # Line 386  minstalldocs() Line 481  minstalldocs()
    481    
    482   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    483   do   do
    484   cd ${SRCDIR}-${abi}   echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"
    485   if [ ! -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} ]   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    486   then   then
    487   install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs."   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    488   fi   fi
    489     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  
    490   done   done
    491  }  }
    492    fi
    493    
    494  ##  if [[ ! -z $(typeset -f minstalldocs) ]]
    495  # multilib mbuild wrappers  then
    496  ##   # rename the old one
    497  multilib_src_prepare()   old_minstalldocs=old$(typeset -f minstalldocs)
    498  {   eval "${old_minstalldocs}"
      munpack  
     }  
    499    
    500  multilib_src_compile()  minstalldocs()
    501  {  {
    502   mconfigure   local abi
    503   mmake   local docfiles
     }  
    504    
    505  multilib_src_install()   local abis_to_run="${MULTILIB_ABIS}"
     {  
      minstall_destdir  
    506    
    507   local i   # respect MULTILIB_ONLY_ABI variable
    508   for abi in ${MULTILIB_ABIS}   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    509    
    510     for abi in ${abis_to_run}
    511   do   do
    512   cd ${SRCDIR}-${abi}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
    513   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   then
    514   FAQ LICENSE NEWS README TODO   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    515   do   fi
    516   if [ -f ${SRCDIR}-${abi}/${i} ]   oldminstalldocs $@ || die
      then  
      minstalldocs ${i} || die  
      fi  
      done  
    517   done   done
    518  }  }
    519    fi
     export_inherits multilib src_prepare src_compile src_install  
    Legend:
    Removed from v.2792  
    changed lines
      Added in v.13784