aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2008-03-06 13:56:08 +0000
committerCliff Brake <cbrake@bec-systems.com>2008-03-06 13:56:08 +0000
commit0229445e18a9e1fd717ad4a7d7ed25c24e768c87 (patch)
tree55b63c51fb6373f70ae99e95e8e233297b211451 /conf
parent151938cb326f8b63dbd32d9663f35b36e3b482ae (diff)
parent27eec02c6a00e3bc978edd8afe432f7db97ba900 (diff)
downloadopenembedded-0229445e18a9e1fd717ad4a7d7ed25c24e768c87.tar.gz
merge of '109805d1a31b4db5eb14cf0d0c8ab0a2eeedaec6'
and '5c8f022efd9bbafe6c82e1c11084eb5ea67334d9'
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/chinook-compat.conf8
1 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index aee81f240f..e89d2185a7 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -59,9 +59,9 @@ PREFERRED_VERSION_automake-native = "1.9.6"
PREFERRED_VERSION_binutils = "2.17.50.0.12"
PREFERRED_VERSION_binutils-cross = "2.18"
-PREFERRED_VERSION_gcc = "3.4.4+csl-arm-2005q3"
-PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
+PREFERRED_VERSION_gcc = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
# Use recent enough version of the headers to let HAL build successfully.
PREFERRED_VERSION_linux-libc-headers = "2.6.20"
@@ -146,7 +146,7 @@ PREFERRED_VERSION_libsoup = "2.2.7"
PREFERRED_VERSION_libglade = "2.4.2"
PREFERRED_VERSION_gnutls = "1.4.5"
PREFERRED_VERSION_libgpg-error = "1.4"
-PREFERRED_VERSION_libgcrypt = "1.2.3"
+PREFERRED_VERSION_libgcrypt = "1.4.0"
PREFERRED_VERSION_gpe-scap = "1.3"