Magellan Linux

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

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

revision 5217 by niro, Mon Dec 16 10:20:07 2013 UTC revision 11529 by niro, Thu Dec 21 09:38:37 2017 UTC
# Line 42  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_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   SDEPEND="$(marchsdepend EMUL_LINUX_32_SDEPEND)"
46   else   else
47   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
48   \$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"   $(marchsdepend EMUL_LINUX_32_SDEPEND)"
49   fi   fi
50  fi  fi
51    
# Line 113  abi-m32() Line 113  abi-m32()
113   fi   fi
114    
115   # run any given command   # run any given command
116     if [[ ${MULTILIB_VERBOSE} = true ]]
117     then
118     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
119     fi
120   eval $@ || die   eval $@ || die
121    
122   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR
# Line 162  abi-m64() Line 166  abi-m64()
166   fi   fi
167    
168   # run any given command   # run any given command
169     if [[ ${MULTILIB_VERBOSE} = true ]]
170     then
171     echo -e "${COLGREEN}Executing:${COLDEFAULT} '$@'"
172     fi
173   eval $@ || die   eval $@ || die
174    
175   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR
# Line 229  mabi() Line 237  mabi()
237    
238  mabi-cc()  mabi-cc()
239  {  {
240   echo "\"gcc -\${ABI}\""   echo "gcc -\${ABI}"
241  }  }
242    
243  mabi-cxx()  mabi-cxx()
244  {  {
245   echo "\"g++ -\${ABI}\""   echo "g++ -\${ABI}"
246  }  }
247    
248  mabi-cflags()  mabi-cflags()
249  {  {
250   echo "\"\${CFLAGS}\""   echo "\${CFLAGS}"
251  }  }
252    
253  mabi-cxxflags()  mabi-cxxflags()
254  {  {
255   echo "\"\${CXXFLAGS}\""   echo "\${CXXFLAGS}"
256  }  }
257    
258  mabi-ldflags()  mabi-ldflags()
259  {  {
260   echo "\"\${LDFLAGS}\""   echo "\${LDFLAGS}"
261  }  }
262    
263  ##  ##
# Line 261  then Line 269  then
269   # rename the old one   # rename the old one
270   old_mconfigure=old$(typeset -f mconfigure)   old_mconfigure=old$(typeset -f mconfigure)
271   eval "${old_mconfigure}"   eval "${old_mconfigure}"
272  fi  
273  mconfigure()  mconfigure()
274  {  {
275   local abi   local abi
# Line 276  mconfigure() Line 284  mconfigure()
284   abi-${abi} oldmconfigure $@ || die   abi-${abi} oldmconfigure $@ || die
285   done   done
286  }  }
   
 if [[ ! -z $(typeset -f cmake_configure) ]]  
 then  
  # rename the old one  
  old_cmake_configure=old$(typeset -f cmake_configure)  
  eval "${old_cmake_configure}"  
287  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}/${SRCSUBDIR}  
  abi-${abi} oldcmake_configure $@ || die  
  done  
  # restore SRCDIR  
  SRCDIR="${saved_SRCDIR}"  
 }  
288    
289  if [[ ! -z $(typeset -f munpack) ]]  if [[ ! -z $(typeset -f munpack) ]]
290  then  then
291   # rename the old one   # rename the old one
292   old_munpack=old$(typeset -f munpack)   old_munpack=old$(typeset -f munpack)
293   eval "${old_munpack}"   eval "${old_munpack}"
294  fi  
295  munpack()  munpack()
296  {  {
297   local abi   local abi
# Line 323  munpack() Line 307  munpack()
307   mv ${SRCDIR} ${SRCDIR}-${abi} || die   mv ${SRCDIR} ${SRCDIR}-${abi} || die
308   done   done
309  }  }
310    fi
311    
312  if [[ ! -z $(typeset -f mmake) ]]  if [[ ! -z $(typeset -f mmake) ]]
313  then  then
314   # rename the old one   # rename the old one
315   old_mmake=old$(typeset -f mmake)   old_mmake=old$(typeset -f mmake)
316   eval "${old_mmake}"   eval "${old_mmake}"
317  fi  
318  mmake()  mmake()
319  {  {
320   local abi   local abi
# Line 345  mmake() Line 330  mmake()
330   abi-${abi} oldmmake $@ || die   abi-${abi} oldmmake $@ || die
331   done   done
332  }  }
333    fi
334    
335  if [[ ! -z $(typeset -f minstall) ]]  if [[ ! -z $(typeset -f minstall) ]]
336  then  then
337   # rename the old one   # rename the old one
338   old_minstall=old$(typeset -f minstall)   old_minstall=old$(typeset -f minstall)
339   eval "${old_minstall}"   eval "${old_minstall}"
340  fi  
341  minstall()  minstall()
342  {  {
343   local abi   local abi
# Line 367  minstall() Line 353  minstall()
353   abi-${abi} oldminstall $@ || die   abi-${abi} oldminstall $@ || die
354   done   done
355  }  }
356    fi
357    
358  minstall_destdir()  minstall_destdir()
359  {  {
# Line 389  then Line 376  then
376   # rename the old one   # rename the old one
377   old_mpatch=old$(typeset -f mpatch)   old_mpatch=old$(typeset -f mpatch)
378   eval "${old_mpatch}"   eval "${old_mpatch}"
379  fi  
380  mpatch()  mpatch()
381  {  {
382   local abi   local abi
# Line 405  mpatch() Line 392  mpatch()
392   oldmpatch $@ || die   oldmpatch $@ || die
393   done   done
394  }  }
395    fi
396    
397  if [[ ! -z $(typeset -f mlibtoolize) ]]  if [[ ! -z $(typeset -f mlibtoolize) ]]
398  then  then
399   # rename the old one   # rename the old one
400   old_mlibtoolize=old$(typeset -f mlibtoolize)   old_mlibtoolize=old$(typeset -f mlibtoolize)
401   eval "${old_mlibtoolize}"   eval "${old_mlibtoolize}"
402  fi  
403  mlibtoolize()  mlibtoolize()
404  {  {
405   local abi   local abi
# Line 427  mlibtoolize() Line 415  mlibtoolize()
415   oldmlibtoolize $@ || die   oldmlibtoolize $@ || die
416   done   done
417  }  }
418    fi
419    
420  if [[ ! -z $(typeset -f mautoreconf) ]]  if [[ ! -z $(typeset -f mautoreconf) ]]
421  then  then
422   # rename the old one   # rename the old one
423   old_mautoreconf=old$(typeset -f mautoreconf)   old_mautoreconf=old$(typeset -f mautoreconf)
424   eval "${old_mautoreconf}"   eval "${old_mautoreconf}"
425  fi  
426  mautoreconf()  mautoreconf()
427  {  {
428   local abi   local abi
# Line 449  mautoreconf() Line 438  mautoreconf()
438   oldmautoreconf $@ || die   oldmautoreconf $@ || die
439   done   done
440  }  }
441    fi
442    
443  if [[ ! -z $(typeset -f minstalldocs) ]]  if [[ ! -z $(typeset -f minstalldocs) ]]
444  then  then
445   # rename the old one   # rename the old one
446   old_minstalldocs=old$(typeset -f minstalldocs)   old_minstalldocs=old$(typeset -f minstalldocs)
447   eval "${old_minstalldocs}"   eval "${old_minstalldocs}"
448  fi  
449  minstalldocs()  minstalldocs()
450  {  {
451   local abi   local abi
# Line 472  minstalldocs() Line 462  minstalldocs()
462   oldminstalldocs $@ || die   oldminstalldocs $@ || die
463   done   done
464  }  }
465    fi
 ##  
 # multilib mbuild wrappers  
 ##  
 multilib_src_prepare()  
 {  
  munpack ${SRCFILE} || die  
 }  
   
 multilib_src_compile()  
 {  
  mconfigure || die  
  mmake || die  
 }  
   
 multilib_src_check()  
 {  
  mmake -j1 -k check || die  
 }  
   
 multilib_src_install()  
 {  
  mmake DESTDIR=${BINDIR} install || die  
   
  local i  
  for abi in ${MULTILIB_ABIS}  
  do  
  cd ${SRCDIR}-${abi}/${SRCSUBDIR}  
  for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \  
  FAQ LICENSE NEWS README TODO  
  do  
  if [ -f ${SRCDIR}-${abi}/${i} ]  
  then  
  minstalldocs ${i} || die  
  fi  
  done  
  done  
 }  
   
 export_inherits multilib src_prepare src_compile src_check src_install  

Legend:
Removed from v.5217  
changed lines
  Added in v.11529