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

    branches/magellan-next/include/multilib.sminc revision 8334 by niro, Thu Jul 14 21:43:24 2011 UTC trunk/include/multilib.sminc revision 9880 by niro, Sat Jan 14 01:48:34 2012 UTC
    # Line 260  cmake_configure() Line 260  cmake_configure()
    260   cd ${SRCDIR}   cd ${SRCDIR}
    261   abi-${abi} oldcmake_configure $@ || die   abi-${abi} oldcmake_configure $@ || die
    262   done   done
    263     # restore SRCDIR
    264     SRCDIR="${saved_SRCDIR}"
    265  }  }
    266    
    267  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
    # Line 388  mlibtoolize() Line 390  mlibtoolize()
    390   done   done
    391  }  }
    392    
    393    if [[ ! -z $(typeset -f mautoreconf) ]]
    394    then
    395     # rename the old one
    396     old_mautoreconf=old$(typeset -f mautoreconf)
    397     eval "${old_mautoreconf}"
    398    fi
    399    mautoreconf()
    400    {
    401     local abi
    402     local abis_to_run="${MULTILIB_ABIS}"
    403    
    404     # respect MULTILIB_ONLY_ABI variable
    405     [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    406    
    407     for abi in ${abis_to_run}
    408     do
    409     echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"
    410     cd ${SRCDIR}-${abi}
    411     oldmautoreconf $@ || die
    412     done
    413    }
    414    
    415    if [[ ! -z $(typeset -f minstalldocs) ]]
    416    then
    417     # rename the old one
    418     old_minstalldocs=old$(typeset -f minstalldocs)
    419     eval "${old_minstalldocs}"
    420    fi
    421  minstalldocs()  minstalldocs()
    422  {  {
    423   local abi   local abi
    424   local docfiles   local docfiles
      docfiles="$@"  
    425    
    426   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    427    
    # Line 402  minstalldocs() Line 431  minstalldocs()
    431   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    432   do   do
    433   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}
    434   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  
    435   done   done
    436  }  }
    437    
    Legend:
    Removed from v.8334  
    changed lines
      Added in v.9880