diff options
author | Florian Boor <florian.boor@kernelconcepts.de> | 2008-07-25 10:04:40 +0000 |
---|---|---|
committer | Florian Boor <florian.boor@kernelconcepts.de> | 2008-07-25 10:04:40 +0000 |
commit | 9391c47983f98bba03c84a94d407177a5cbb6890 (patch) | |
tree | b5588a7806d3c2d511d540415452e0e873686793 /conf/distro/angstrom-2008.1.conf | |
parent | d65f1724834111db986f7a13807a809c57b71496 (diff) | |
parent | d6bc4e97a03ac861f27cb3a2afafa374ccebe6ae (diff) |
merge of 'c0b80d25e48faf3cabe4d83d5586401a0a5e1188'
and 'c5251d02ae821f28febfb91fb76af9cd01b8f3fd'
Diffstat (limited to 'conf/distro/angstrom-2008.1.conf')
-rw-r--r-- | conf/distro/angstrom-2008.1.conf | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 3026e6f043..7dd416b102 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -71,8 +71,9 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.23" #Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing. PREFERRED_VERSION_glibc ?= "2.6.1" -PREFERRED_VERSION_glibc-intermediate ?= "2.6.1" PREFERRED_VERSION_glibc-initial ?= "2.6.1" +PREFERRED_VERSION_uclibc ?= "0.9.29" +PREFERRED_VERSION_uclibc-initial ?= "0.9.29" #Prefer a newer GTK+ and friends PREFERRED_VERSION_gtk+ ?= "2.12.3" @@ -104,14 +105,16 @@ ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" #Everybody else can just use this: ANGSTROM_GCC_VERSION ?= "4.2.4" +PREFERRED_VERSION_binutils-cross ?= "2.18.50.0.7" +PREFERRED_VERSION_binutils-cross-sdk ?= "2.18.50.0.7" -PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}" -PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}" -PREFERRED_VERSION_gcc-cross-sdk ?= "${ANGSTROM_GCC_VERSION}" -PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}" +PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}" +PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}" +PREFERRED_VERSION_gcc-cross-sdk ?= "${ANGSTROM_GCC_VERSION}" +PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}" +PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}" #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom -require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc require conf/distro/include/preferred-xorg-versions-X11R7.3.inc @@ -123,6 +126,7 @@ PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" # Virtuals: PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" |