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 5485 by niro, Tue Jun 29 23:01:28 2010 UTC revision 6406 by niro, Mon Aug 23 11:25:26 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 194  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  ##  ##
    # Line 252  munpack() Line 257  munpack()
    257  {  {
    258   local abi   local abi
    259   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
      local dest="$2"  
    260    
    261   # respect MULTILIB_ONLY_ABI variable   # respect MULTILIB_ONLY_ABI variable
    262   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    # Line 260  munpack() Line 264  munpack()
    264   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    265   do   do
    266   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
    267   oldmunpack ${SRCFILE} ${dest} || die   oldmunpack ${SRCFILE} || die
    268   mv ${SRCDIR} ${SRCDIR}-${abi} || die   mv ${SRCDIR} ${SRCDIR}-${abi} || die
    269   done   done
    270  }  }
    Legend:
    Removed from v.5485  
    changed lines
      Added in v.6406