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 3671 by niro, Thu Oct 29 10:40:29 2009 UTC trunk/include/multilib.sminc revision 20978 by niro, Wed Feb 19 12:10:12 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   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   # keep pkgconfig clean
    79     local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    80     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 PKG_CONFIG_PATH   unset ABI CC CXX ABI_LIBDIR
    119     # keep pkgconfig clean
    120     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 110  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   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   # keep pkgconfig clean
    143     local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    144     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 PKG_CONFIG_PATH   unset ABI CC CXX ABI_LIBDIR
    168     # keep pkgconfig clean
    169     export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    170     export LDFLAGS="${saved_ldflags}"
    171  }  }
    172    
    173  only-m32()  only-m32()
    # Line 146  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 167  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 181  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 194  if [[ ! -z $(typeset -f mconfigure) ]] Line 260  if [[ ! -z $(typeset -f mconfigure) ]]
    260  then  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  fi
    265  mconfigure()  mconfigure()
    266  {  {
    # Line 206  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    
    280    if [[ ! -z $(typeset -f cmake_configure) ]]
    281    then
    282     # rename the old one
    283     old_cmake_configure=old$(typeset -f cmake_configure)
    284     eval "${old_cmake_configure}"
    285    fi
    286    cmake_configure()
    287    {
    288     local abi
    289     local abis_to_run="${MULTILIB_ABIS}"
    290    
    291     # respect MULTILIB_ONLY_ABI variable
    292     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    293    
    294     local saved_SRCDIR="${SRCDIR}"
    295     for abi in ${abis_to_run}
    296     do
    297     cd ${BUILDDIR}/build-${abi}
    298     SRCDIR="${saved_SRCDIR}-${abi}"
    299     abi-${abi} oldcmake_configure $@ || die
    300     done
    301     # restore SRCDIR
    302     SRCDIR="${saved_SRCDIR}"
    303    }
    304    
    305    if [[ ! -z $(typeset -f cmake_src_compile) ]]
    306    then
    307     # rename the old one
    308     old_cmake_src_compile=old$(typeset -f cmake_src_compile)
    309     eval "${old_cmake_src_compile}"
    310    fi
    311    cmake_src_compile()
    312    {
    313     local abi
    314     local abis_to_run="${MULTILIB_ABIS}"
    315    
    316     # respect MULTILIB_ONLY_ABI variable
    317     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    318    
    319     for abi in ${abis_to_run}
    320     do
    321     # remove build dir if exist
    322     [[ -d ${BUILDDIR}/build-${abi} ]] && rm -rf ${BUILDDIR}/build-${abi}
    323    
    324     # build outside of the source dir
    325     install -d ${BUILDDIR}/build-${abi} || die
    326     cd ${BUILDDIR}/build-${abi}
    327     done
    328    
    329     cmake_configure || die
    330    
    331     for abi in ${abis_to_run}
    332     do
    333     cd ${BUILDDIR}/build-${abi}
    334     abi-${abi} oldmmake $@ || die
    335     done
    336    }
    337    
    338    if [[ ! -z $(typeset -f cmake_src_check) ]]
    339    then
    340     # rename the old one
    341     old_cmake_src_check=old$(typeset -f cmake_src_check)
    342     eval "${old_cmake_check}"
    343    fi
    344    cmake_src_check()
    345    {
    346     local abi
    347     local abis_to_run="${MULTILIB_ABIS}"
    348    
    349     # respect MULTILIB_ONLY_ABI variable
    350     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    351    
    352     for abi in ${abis_to_run}
    353     do
    354     cd ${BUILDDIR}/build-${abi}
    355     mmake -j1 -k check || die
    356     done
    357    }
    358    
    359    if [[ ! -z $(typeset -f cmake_src_install) ]]
    360    then
    361     # rename the old one
    362     old_cmake_src_install=old$(typeset -f cmake_src_install)
    363     eval "${old_cmake_install}"
    364    fi
    365    cmake_src_install()
    366    {
    367     local abi
    368     local abis_to_run="${MULTILIB_ABIS}"
    369    
    370     # respect MULTILIB_ONLY_ABI variable
    371     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    372    
    373     for abi in ${abis_to_run}
    374     do
    375     # install build outside of the source dir
    376     cd ${BUILDDIR}/build-${abi}
    377     abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die
    378     done
    379    }
    380    
    381  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
    382  then  then
    383   # rename the old one   # rename the old one
    # Line 228  munpack() Line 395  munpack()
    395   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    396   do   do
    397   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
    398   oldmunpack ${SRCFILE} || die   oldmunpack $@ || die
    399   mv ${SRCDIR} ${SRCDIR}-${abi} || die   mv ${SRCDIR} ${SRCDIR}-${abi} || die
    400   done   done
    401  }  }
    # Line 250  mmake() Line 417  mmake()
    417   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    418   do   do
    419   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"
    420   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    421   abi-${abi} oldmmake $@ || die   abi-${abi} oldmmake $@ || die
    422   done   done
    423  }  }
    # Line 272  minstall() Line 439  minstall()
    439   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    440   do   do
    441   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    442   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    443   abi-${abi} oldminstall $@ || die   abi-${abi} oldminstall $@ || die
    444   done   done
    445  }  }
    # Line 288  minstall_destdir() Line 455  minstall_destdir()
    455   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    456   do   do
    457   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
    458   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    459   make DESTDIR=${BINDIR} $@ install || die   make DESTDIR=${BINDIR} $@ install || die
    460   done   done
    461  }  }
    # Line 310  mpatch() Line 477  mpatch()
    477   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    478   do   do
    479   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"
    480   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    481   oldmpatch $@ || die   oldmpatch $@ || die
    482   done   done
    483  }  }
    # Line 332  mlibtoolize() Line 499  mlibtoolize()
    499   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    500   do   do
    501   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"
    502   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    503   oldmlibtoolize $@ || die   oldmlibtoolize $@ || die
    504   done   done
    505  }  }
    506    
    507    if [[ ! -z $(typeset -f mautoreconf) ]]
    508    then
    509     # rename the old one
    510     old_mautoreconf=old$(typeset -f mautoreconf)
    511     eval "${old_mautoreconf}"
    512    fi
    513    mautoreconf()
    514    {
    515     local abi
    516     local abis_to_run="${MULTILIB_ABIS}"
    517    
    518     # respect MULTILIB_ONLY_ABI variable
    519     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    520    
    521     for abi in ${abis_to_run}
    522     do
    523     echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"
    524     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    525     oldmautoreconf $@ || die
    526     done
    527    }
    528    
    529    if [[ ! -z $(typeset -f minstalldocs) ]]
    530    then
    531     # rename the old one
    532     old_minstalldocs=old$(typeset -f minstalldocs)
    533     eval "${old_minstalldocs}"
    534    fi
    535  minstalldocs()  minstalldocs()
    536  {  {
    537   local abi   local abi
    538   local docfiles   local docfiles
      docfiles="$@"  
    539    
    540   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    541    
    # Line 350  minstalldocs() Line 544  minstalldocs()
    544    
    545   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    546   do   do
    547   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    548   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  
    549   done   done
    550  }  }
    551    
    # Line 370  minstalldocs() Line 554  minstalldocs()
    554  ##  ##
    555  multilib_src_prepare()  multilib_src_prepare()
    556  {  {
    557   munpack   munpack ${SRCFILE} || die
    558  }  }
    559    
    560  multilib_src_compile()  multilib_src_compile()
    561  {  {
    562   mconfigure   if [[ ! -z $(typeset -f cmake_src_compile) ]]
    563   mmake   then
    564     cmake_src_compile || die
    565     else
    566     mconfigure || die
    567     mmake || die
    568     fi
    569    }
    570    
    571    multilib_src_check()
    572    {
    573     if [[ ! -z $(typeset -f cmake_src_check) ]]
    574     then
    575     cmake_src_check || die
    576     else
    577     mmake -j1 -k check || die
    578     fi
    579  }  }
    580    
    581  multilib_src_install()  multilib_src_install()
    582  {  {
    583   minstall_destdir   if [[ ! -z $(typeset -f cmake_src_install) ]]
    584     then
    585     cmake_src_compile || die
    586     else
    587     mmake DESTDIR=${BINDIR} install || die
    588     fi
    589    
    590   local i   local i
    591   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
    592   do   do
    593   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}/${SRCSUBDIR}
    594   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
    595   FAQ LICENSE NEWS README TODO   FAQ LICENSE NEWS README TODO
    596   do   do
    # Line 398  multilib_src_install() Line 602  multilib_src_install()
    602   done   done
    603  }  }
    604    
    605  export_inherits multilib src_prepare src_compile src_install  export_inherits multilib src_prepare src_compile src_check src_install
    Legend:
    Removed from v.3671  
    changed lines
      Added in v.20978