Magellan Linux

Diff of /trunk/include/multilib.sminc

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

revision 11827 by niro, Wed Apr 18 21:41:58 2012 UTC revision 20903 by niro, Thu Feb 13 14:41:09 2014 UTC
# Line 105  abi-m32() Line 105  abi-m32()
105   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"
106   fi   fi
107   uname(){ linux32 uname $@; } && export -f uname   uname(){ linux32 uname $@; } && export -f uname
108   ORIG_CHOST="${CHOST}" && export CHOST="i686-pc-linux-gnu"   local orig_chost="${CHOST}" && export CHOST="i686-pc-linux-gnu"
109   fi   fi
110   if [[ ${MULTILIB_VERBOSE} = true ]]   if [[ ${MULTILIB_VERBOSE} = true ]]
111   then   then
# Line 124  abi-m32() Line 124  abi-m32()
124   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
125   then   then
126   unset uname   unset uname
127   export CHOST="${ORIG_CHOST}" && unset ORIG_CHOST   export CHOST="${orig_chost}" && unset orig_chost
128   fi   fi
129  }  }
130    
# 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()
241    {
242     echo "\${CFLAGS}"
243    }
244    
245    mabi-cxxflags()
246    {
247     echo "\${CXXFLAGS}"
248    }
249    
250    mabi-ldflags()
251    {
252     echo "\${LDFLAGS}"
253  }  }
254    
255  ##  ##
# Line 304  munpack() Line 319  munpack()
319   for abi in ${abis_to_run}   for abi in ${abis_to_run}
320   do   do
321   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
322   oldmunpack ${SRCFILE} || die   oldmunpack $@ || die
323   mv ${SRCDIR} ${SRCDIR}-${abi} || die   mv ${SRCDIR} ${SRCDIR}-${abi} || die
324   done   done
325  }  }
# Line 463  minstalldocs() Line 478  minstalldocs()
478  ##  ##
479  multilib_src_prepare()  multilib_src_prepare()
480  {  {
481   munpack   munpack ${SRCFILE} || die
482  }  }
483    
484  multilib_src_compile()  multilib_src_compile()
485  {  {
486   mconfigure   mconfigure || die
487   mmake   mmake || die
488  }  }
489    
490  multilib_src_check()  multilib_src_check()
# Line 479  multilib_src_check() Line 494  multilib_src_check()
494    
495  multilib_src_install()  multilib_src_install()
496  {  {
497   minstall_destdir   mmake DESTDIR=${BINDIR} install || die
498    
499   local i   local i
500   for abi in ${MULTILIB_ABIS}   for abi in ${MULTILIB_ABIS}

Legend:
Removed from v.11827  
changed lines
  Added in v.20903