Magellan Linux

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 9334 by niro, Sat Nov 26 13:37:05 2011 UTC trunk/include/multilib.sminc revision 11030 by niro, Sat Feb 11 19:34:51 2012 UTC
# Line 4  Line 4 
4  # be verbose or nor (true|false}  # be verbose or nor (true|false}
5  : ${MULTILIB_VERBOSE="true"}  : ${MULTILIB_VERBOSE="true"}
6    
7    # multilib should call all dependant includes, which gets overridden
8    sminclude mtools
9    
10  # do not define EMUL_LINUX_32 after inherit of multlib !!  # do not define EMUL_LINUX_32 after inherit of multlib !!
11  # it may break i*86 builds  # it may break i*86 builds
12    
# Line 260  cmake_configure() Line 263  cmake_configure()
263   cd ${SRCDIR}   cd ${SRCDIR}
264   abi-${abi} oldcmake_configure $@ || die   abi-${abi} oldcmake_configure $@ || die
265   done   done
266     # restore SRCDIR
267     SRCDIR="${saved_SRCDIR}"
268  }  }
269    
270  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
# Line 420  minstalldocs() Line 425  minstalldocs()
425  {  {
426   local abi   local abi
427   local docfiles   local docfiles
  docfiles="$@"  
428    
429   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
430    
# Line 430  minstalldocs() Line 434  minstalldocs()
434   for abi in ${abis_to_run}   for abi in ${abis_to_run}
435   do   do
436   cd ${SRCDIR}-${abi}   cd ${SRCDIR}-${abi}
437   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  
438   done   done
439  }  }
440    
# Line 458  multilib_src_compile() Line 452  multilib_src_compile()
452   mmake   mmake
453  }  }
454    
455    multilib_src_check()
456    {
457     mmake -j1 -k check || die
458    }
459    
460  multilib_src_install()  multilib_src_install()
461  {  {
462   minstall_destdir   minstall_destdir
# Line 477  multilib_src_install() Line 476  multilib_src_install()
476   done   done
477  }  }
478    
479  export_inherits multilib src_prepare src_compile src_install  export_inherits multilib src_prepare src_compile src_check src_install

Legend:
Removed from v.9334  
changed lines
  Added in v.11030