Magellan Linux

Diff of /trunk/include/multilib.sminc

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

revision 31847 by niro, Thu Oct 12 13:30:10 2017 UTC revision 31848 by niro, Tue Dec 18 13:15:14 2018 UTC
# Line 7  export MULTILIB_BUILD="true" Line 7  export MULTILIB_BUILD="true"
7  # be verbose or nor (true|false}  # be verbose or nor (true|false}
8  : ${MULTILIB_VERBOSE="true"}  : ${MULTILIB_VERBOSE="true"}
9    
10    # enter the abi srcdir as default setting
11    : ${MULTILIB_ENTER_SRCDIR="true"}
12    
13  # multilib should call all dependant includes, which gets overridden  # multilib should call all dependant includes, which gets overridden
14  sminclude mtools  sminclude mtools
15    
# Line 190  only-m32() Line 193  only-m32()
193   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
194   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
195    
196   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
197     then
198     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
199     fi
200   abi-${abi} $@ || die   abi-${abi} $@ || die
201    
202   # unset this is very important   # unset this is very important
# Line 211  only-m64() Line 217  only-m64()
217   # export this for mpatch etc (to repect only-${abi})   # export this for mpatch etc (to repect only-${abi})
218   export MULTILIB_ONLY_ABI=${abi}   export MULTILIB_ONLY_ABI=${abi}
219    
220   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
221     then
222     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
223     fi
224   abi-${abi} $@ || die   abi-${abi} $@ || die
225    
226   # unset this is very important   # unset this is very important
# Line 225  all-abis() Line 234  all-abis()
234   local abi   local abi
235   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}
236   do   do
237   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
238     then
239     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
240     fi
241   abi-${abi} $@ || die   abi-${abi} $@ || die
242   done   done
243  }  }
# Line 280  mconfigure() Line 292  mconfigure()
292    
293   for abi in ${abis_to_run}   for abi in ${abis_to_run}
294   do   do
295   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
296     then
297     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
298     fi
299   abi-${abi} oldmconfigure $@ || die   abi-${abi} oldmconfigure $@ || die
300   done   done
301  }  }
# Line 326  mmake() Line 341  mmake()
341   for abi in ${abis_to_run}   for abi in ${abis_to_run}
342   do   do
343   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"
344   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
345     then
346     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
347     fi
348   abi-${abi} oldmmake $@ || die   abi-${abi} oldmmake $@ || die
349   done   done
350  }  }
# Line 349  minstall() Line 367  minstall()
367   for abi in ${abis_to_run}   for abi in ${abis_to_run}
368   do   do
369   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
370   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
371     then
372     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
373     fi
374   abi-${abi} oldminstall $@ || die   abi-${abi} oldminstall $@ || die
375   done   done
376  }  }
# Line 366  minstall_destdir() Line 387  minstall_destdir()
387   for abi in ${abis_to_run}   for abi in ${abis_to_run}
388   do   do
389   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}installing for ABI -${abi}${COLDEFAULT}"
390   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
391     then
392     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
393     fi
394   make DESTDIR=${BINDIR} $@ install || die   make DESTDIR=${BINDIR} $@ install || die
395   done   done
396  }  }
# Line 388  mpatch() Line 412  mpatch()
412   for abi in ${abis_to_run}   for abi in ${abis_to_run}
413   do   do
414   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}appling patch for ABI -${abi}${COLDEFAULT}"
415   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
416     then
417     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
418     fi
419   oldmpatch $@ || die   oldmpatch $@ || die
420   done   done
421  }  }
# Line 411  mlibtoolize() Line 438  mlibtoolize()
438   for abi in ${abis_to_run}   for abi in ${abis_to_run}
439   do   do
440   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running mlibtoolize for ABI -${abi}${COLDEFAULT}"
441   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
442     then
443     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
444     fi
445   oldmlibtoolize $@ || die   oldmlibtoolize $@ || die
446   done   done
447  }  }
# Line 434  mautoreconf() Line 464  mautoreconf()
464   for abi in ${abis_to_run}   for abi in ${abis_to_run}
465   do   do
466   echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running mautoreconf for ABI -${abi}${COLDEFAULT}"
467   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
468     then
469     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
470     fi
471   oldmautoreconf $@ || die   oldmautoreconf $@ || die
472   done   done
473  }  }
# Line 458  minstalldocs() Line 491  minstalldocs()
491    
492   for abi in ${abis_to_run}   for abi in ${abis_to_run}
493   do   do
494   cd ${SRCDIR}-${abi}/${SRCSUBDIR}   if [[ ${MULTILIB_ENTER_SRCDIR} = true ]]
495     then
496     cd ${SRCDIR}-${abi}/${SRCSUBDIR}
497     fi
498   oldminstalldocs $@ || die   oldminstalldocs $@ || die
499   done   done
500  }  }

Legend:
Removed from v.31847  
changed lines
  Added in v.31848