Magellan Linux

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

    Diff of /smage/trunk/include/multilib.sminc

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

    revision 911 by niro, Sat Jan 2 16:59:51 2010 UTC revision 912 by niro, Tue Dec 7 21:20:55 2010 UTC
    # Line 1  Line 1 
    1  # $Header: /magellan-cvs/smage/include/multilib.sminc,v 1.33 2007-11-13 15:49:09 niro Exp $  # $Id$
    2  # multilib abis  # multilib abis
    3    
    4  # do not define EMUL_LINUX_32 after inherit of multlib !!  # do not define EMUL_LINUX_32 after inherit of multlib !!
    # Line 14  case ${ARCH} in Line 14  case ${ARCH} in
    14   # add linux32 to the dependencies   # add linux32 to the dependencies
    15   if [[ ${EMUL_LINUX_32} = true ]]   if [[ ${EMUL_LINUX_32} = true ]]
    16   then   then
    17   EMUL_LINUX_32_SDEPENDS_x86_64=">= dev-util/linux32-1"   EMUL_LINUX_32_SDEPEND_x86_64=">= dev-util/linux32-1"
    18   SPECIAL_VARS="${SPECIAL_VARS} EMUL_LINUX_32_SDEPENDS_x86_64"   SPECIAL_VARS="${SPECIAL_VARS} EMUL_LINUX_32_SDEPEND_x86_64"
    19   fi   fi
    20   ;;   ;;
    21   i*86)   i*86)
    # Line 33  then Line 33  then
    33   # the var ist decided with our common eval+echo magic   # the var ist decided with our common eval+echo magic
    34   if [[ -z ${SDEPEND} ]]   if [[ -z ${SDEPEND} ]]
    35   then   then
    36   SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPENDS_\${ARCH/i*86/x86} | tr ';' '\n')"   SDEPEND="\$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
    37   else   else
    38   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
    39   \$(eval echo \\\$EMUL_LINUX_32_SDEPENDS_\${ARCH/i*86/x86} | tr ';' '\n')"   \$(eval echo \\\$EMUL_LINUX_32_SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
    40   fi   fi
    41  fi  fi
    42    
    # 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 186  all-abis() Line 194  all-abis()
    194   done   done
    195  }  }
    196    
    197    mabi()
    198    {
    199     echo \${ABI}
    200    }
    201    
    202  ##  ##
    203  # multilib compile functions  # multilib compile functions
    204  ##  ##
    Legend:
    Removed from v.911  
    changed lines
      Added in v.912