summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristoffer Ericson <kristoffer_e1@hotmail.com>2006-08-11 16:24:06 +0000
committerKristoffer Ericson <kristoffer_e1@hotmail.com>2006-08-11 16:24:06 +0000
commitebd2f8f3a6a7bd90649b75a4e54ff87d9dd6f2a1 (patch)
tree29e4f7fae653fcb759d29a760b92071fa6b9cf10
parent1f4d6579866e58bd965bc649ae221eb07b6bd538 (diff)
parentaec8ea24516b5eea58058f6c9363c3dadb03517a (diff)
merge of bddbb157960dc74708ee1f412dc226c4e119322f
and d6d342eb596dfa4dccbd85b8270c275e8e076491
-rw-r--r--conf/distro/jlime-donkey.conf7
1 files changed, 3 insertions, 4 deletions
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index fc432afecb..de0cee56fa 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -14,10 +14,9 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
#<>
#<> We will set CVS DATE when things are known to work.
#<>
-PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+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"
#<> We want this so we can crosscompile the kernel using gcc 3.4.3
#<> Also, select version of modules (and kernel)
@@ -43,8 +42,8 @@ PREFERRED_VERSION_gcc = "4.1.1"
PREFERRED_VERSION_gcc-cross = "4.1.1"
PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"
-PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
-PREFERRED_VERSION_glibc-initial = "2.3.2"
+PREFERRED_VERSION_glibc = "2.4"
+PREFERRED_VERSION_glibc-intermediate = "2.4"
require conf/distro/include/preferred-xorg-versions-X11R7.1.inc