diff options
author | Michael Lauer <mickey@vanille-media.de> | 2008-01-30 09:17:50 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2008-01-30 09:17:50 +0000 |
commit | a87a2ebb1845dc818a46b80054bcb0370450ae41 (patch) | |
tree | 32209e7579e58fb9e3f0aa2574f667cae4d0ecad | |
parent | 489bdfa4573e3d1a4c3b16fd704b83170158e29f (diff) | |
parent | 5e8b5638942148711880a4f51bfc632440680253 (diff) |
merge of '69accd77bc1602a9ed5957e6db7754b669a5e8ea'
and '77255eff938f77a73e2bcaf9e08a9568e2c88208'
-rw-r--r-- | conf/distro/generic.conf | 44 |
1 files changed, 17 insertions, 27 deletions
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 0286666495..d67be1d738 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -36,28 +36,34 @@ MACHINE_KERNEL_VERSION = "2.6" # # Binutils & Compiler # -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_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" +PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_VERSION_gcc ?= "4.1.1" PREFERRED_VERSION_gcc-cross ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.17.50.0.5" -PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" +PREFERRED_VERSION_binutils ?= "2.18" +PREFERRED_VERSION_binutils-cross ?= "2.18" # # Target OS & FPU system -# +# TARGET_OS = "linux" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" +# +# C library +# PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" PREFERRED_PROVIDER_virtual/libc = "glibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.23" PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" @@ -65,28 +71,12 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.5" # Bootstrap & Init # PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -require conf/distro/include/sane-srcdates.inc - -# -# Framebuffer & X -# -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -PREFERRED_PROVIDER_tslib ?= "tslib" -require conf/distro/include/preferred-xorg-versions-X11R7.2.inc # -# GPE +# Preferred versions # -require conf/distro/include/preferred-gpe-versions-2.8.inc -# -# Opie -# -QTE_VERSION = "2.3.10" -PALMTOP_USE_MULTITHREADED_QTE = "yes" -require conf/distro/include/preferred-opie-versions.inc +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc -# -# Enlightenment -# -require conf/distro/include/preferred-e-versions.inc +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" |