Magellan Linux

Diff of /branches/R11-unstable/include/multilib.sminc

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

revision 13488 by niro, Wed Oct 10 09:13:52 2012 UTC revision 20978 by niro, Wed Feb 19 12:10:12 2014 UTC
# Line 229  mabi() Line 229  mabi()
229    
230  mabi-cc()  mabi-cc()
231  {  {
232   echo "\"gcc -\${ABI}\""   echo "gcc -\${ABI}"
233  }  }
234    
235  mabi-cxx()  mabi-cxx()
236  {  {
237   echo "\"g++ -\${ABI}\""   echo "g++ -\${ABI}"
238  }  }
239    
240  mabi-cflags()  mabi-cflags()
241  {  {
242   echo "\"\${CFLAGS}\""   echo "\${CFLAGS}"
243  }  }
244    
245  mabi-cxxflags()  mabi-cxxflags()
246  {  {
247   echo "\"\${CXXFLAGS}\""   echo "\${CXXFLAGS}"
248  }  }
249    
250  mabi-ldflags()  mabi-ldflags()
251  {  {
252   echo "\"\${LDFLAGS}\""   echo "\${LDFLAGS}"
253  }  }
254    
255  ##  ##
# Line 294  cmake_configure() Line 294  cmake_configure()
294   local saved_SRCDIR="${SRCDIR}"   local saved_SRCDIR="${SRCDIR}"
295   for abi in ${abis_to_run}   for abi in ${abis_to_run}
296   do   do
297     cd ${BUILDDIR}/build-${abi}
298   SRCDIR="${saved_SRCDIR}-${abi}"   SRCDIR="${saved_SRCDIR}-${abi}"
  cd ${SRCDIR}/${SRCSUBDIR}  
299   abi-${abi} oldcmake_configure $@ || die   abi-${abi} oldcmake_configure $@ || die
300   done   done
301   # restore SRCDIR   # restore SRCDIR
302   SRCDIR="${saved_SRCDIR}"   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 478  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()  multilib_src_check()
572  {  {
573   mmake -j1 -k check || die   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}

Legend:
Removed from v.13488  
changed lines
  Added in v.20978