From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 16 Jan 2006 09:53:12 +0000 (+0000)
Subject: merge of 5ea9ec229c4d406638d5639fade5d53798bc6556
X-Git-Tag: Release-2010-05/1~9453^2~2650
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2cfb2628d56ad31d4fe97a08b1012c252109b90;p=openembedded.git

merge of 5ea9ec229c4d406638d5639fade5d53798bc6556
     and bc3350438c52d7c9d7d4f8eb5b38a213796269cb
---

f2cfb2628d56ad31d4fe97a08b1012c252109b90
diff --cc conf/distro/slugos.conf
index 61e4d32d5f,bbacf49aa2..58e2ab65c7
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@@ -144,8 -146,9 +146,10 @@@ SLUGOS_EXTRA_RDEPENDS ?= "
  PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
  PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
  PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
+ # Select 2.6 versions of the depmod support
  PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
  
  # compiler/binary/library versions (unslung uses different ones so these
  # cannot be in ${MACHINE}.conf)