Magellan Linux

  • Back to homepage
    • /[smage]/trunk/include/multilib.sminc

    Diff of /trunk/include/multilib.sminc

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

    revision 4782 by niro, Sun Dec 27 23:21:20 2009 UTC revision 5485 by niro, Tue Jun 29 23:01:28 2010 UTC
    # Line 65  abi-m32() Line 65  abi-m32()
    65   then   then
    66   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    67   fi   fi
    68   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   # keep pkgconfig clean
    69     local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    70     export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    71    
    72   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    73   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
    # Line 92  abi-m32() Line 94  abi-m32()
    94   # run any given command   # run any given command
    95   eval $@ || die   eval $@ || die
    96    
    97   unset ABI CC CXX ABI_LIBDIR LDFLAGS PKG_CONFIG_PATH   unset ABI CC CXX ABI_LIBDIR LDFLAGS
    98     # keep pkgconfig clean
    99     export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    100    
    101   # restore original settings   # restore original settings
    102   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    # Line 112  abi-m64() Line 116  abi-m64()
    116   then   then
    117   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"   export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}"
    118   fi   fi
    119   export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"   # keep pkgconfig clean
    120     local orig_pkg_config_path="${PKG_CONFIG_PATH}"
    121     export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
    122    
    123   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
    124   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"   echo -e "${COLBLUE}*** ${COLGREEN}  ABI${COLDEFAULT}='${ABI}'"
    # Line 131  abi-m64() Line 137  abi-m64()
    137   # run any given command   # run any given command
    138   eval $@ || die   eval $@ || die
    139    
    140   unset ABI CC CXX ABI_LIBDIR LDFLAGS PKG_CONFIG_PATH   unset ABI CC CXX ABI_LIBDIR LDFLAGS
    141     # keep pkgconfig clean
    142     export PKG_CONFIG_PATH="${orig_pkg_config_path}"
    143  }  }
    144    
    145  only-m32()  only-m32()
    # Line 194  if [[ ! -z $(typeset -f mconfigure) ]] Line 202  if [[ ! -z $(typeset -f mconfigure) ]]
    202  then  then
    203   # rename the old one   # rename the old one
    204   old_mconfigure=old$(typeset -f mconfigure)   old_mconfigure=old$(typeset -f mconfigure)
    205   eval ${old_mconfigure}   eval "${old_mconfigure}"
    206  fi  fi
    207  mconfigure()  mconfigure()
    208  {  {
    # Line 215  if [[ ! -z $(typeset -f cmake_configure) Line 223  if [[ ! -z $(typeset -f cmake_configure)
    223  then  then
    224   # rename the old one   # rename the old one
    225   old_cmake_configure=old$(typeset -f cmake_configure)   old_cmake_configure=old$(typeset -f cmake_configure)
    226   eval ${old_cmake_configure}   eval "${old_cmake_configure}"
    227  fi  fi
    228  cmake_configure()  cmake_configure()
    229  {  {
    # Line 244  munpack() Line 252  munpack()
    252  {  {
    253   local abi   local abi
    254   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    255     local dest="$2"
    256    
    257   # respect MULTILIB_ONLY_ABI variable   # respect MULTILIB_ONLY_ABI variable
    258   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    # Line 251  munpack() Line 260  munpack()
    260   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    261   do   do
    262   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
    263   oldmunpack ${SRCFILE} || die   oldmunpack ${SRCFILE} ${dest} || die
    264   mv ${SRCDIR} ${SRCDIR}-${abi} || die   mv ${SRCDIR} ${SRCDIR}-${abi} || die
    265   done   done
    266  }  }
    Legend:
    Removed from v.4782  
    changed lines
      Added in v.5485