Magellan Linux

  • Back to homepage
    • /[smage]/branches/R11-unstable/include/multilib.sminc

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

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

    revision 11825 by niro, Wed Apr 18 18:05:43 2012 UTC revision 13972 by niro, Fri Nov 2 10:45:29 2012 UTC
    # Line 98  abi-m32() Line 98  abi-m32()
    98   fi   fi
    99    
    100   # configure a linux32 emulated build   # configure a linux32 emulated build
    101     local linux32
    102   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    103   then   then
    104   if [[ ${MULTILIB_VERBOSE} = true ]]   if [[ ${MULTILIB_VERBOSE} = true ]]
    # Line 105  abi-m32() Line 106  abi-m32()
    106   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"   echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"
    107   fi   fi
    108   uname(){ linux32 uname $@; } && export -f uname   uname(){ linux32 uname $@; } && export -f uname
    109   ORIG_CHOST="${CHOST}" && export CHOST="i686-pc-linux-gnu"   local orig_chost="${CHOST}" && export CHOST="i686-pc-linux-gnu"
    110     linux32="linux32"
    111   fi   fi
    112   if [[ ${MULTILIB_VERBOSE} = true ]]   if [[ ${MULTILIB_VERBOSE} = true ]]
    113   then   then
    # Line 113  abi-m32() Line 115  abi-m32()
    115   fi   fi
    116    
    117   # run any given command   # run any given command
    118   eval $@ || die   eval ${linux32} $@ || die
    119    
    120   unset ABI CC CXX ABI_LIBDIR   unset ABI CC CXX ABI_LIBDIR
    121   # keep pkgconfig clean   # keep pkgconfig clean
    # Line 124  abi-m32() Line 126  abi-m32()
    126   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    127   then   then
    128   unset uname   unset uname
    129   export CHOST="${ORIG_CHOST}" && unset ORIG_CHOST   export CHOST="${orig_chost}" && unset orig_chost
    130     unset linux32
    131   fi   fi
    132  }  }
    133    
    # Line 229  mabi() Line 232  mabi()
    232    
    233  mabi-cc()  mabi-cc()
    234  {  {
    235   echo "gcc -\${ABI}"   echo "\"gcc -\${ABI}\""
    236  }  }
    237    
    238  mabi-cxx()  mabi-cxx()
    239  {  {
    240   echo "g++ -\${ABI}"   echo "\"g++ -\${ABI}\""
    241    }
    242    
    243    mabi-cflags()
    244    {
    245     echo "\"\${CFLAGS}\""
    246    }
    247    
    248    mabi-cxxflags()
    249    {
    250     echo "\"\${CXXFLAGS}\""
    251    }
    252    
    253    mabi-ldflags()
    254    {
    255     echo "\"\${LDFLAGS}\""
    256  }  }
    257    
    258  ##  ##
    # Line 304  munpack() Line 322  munpack()
    322   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    323   do   do
    324   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
    325   oldmunpack ${SRCFILE} || die   oldmunpack $@ || die
    326   mv ${SRCDIR} ${SRCDIR}-${abi} || die   mv ${SRCDIR} ${SRCDIR}-${abi} || die
    327   done   done
    328  }  }
    # Line 463  minstalldocs() Line 481  minstalldocs()
    481  ##  ##
    482  multilib_src_prepare()  multilib_src_prepare()
    483  {  {
    484   munpack   munpack ${SRCFILE}
    485  }  }
    486    
    487  multilib_src_compile()  multilib_src_compile()
    Legend:
    Removed from v.11825  
    changed lines
      Added in v.13972