summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-09-14 11:23:01 +0000
committerKoen Kooi <koen@openembedded.org>2006-09-14 11:23:01 +0000
commita86ec0f346b23387cc6e343020b90e7a57d6bfcb (patch)
tree41598fa16a6b82c95fa988ee1981a1cdf1a0f098 /conf/distro
parent54ef07897ac9cadb8d291dc05e4494ba68695411 (diff)
parent941db9d13d684b5e994f2acc9f8eae9ae6b855de (diff)
merge of '33a35e22030bcab7919a207fd07515e79928efab'
and '647f04c8db2652dabb7190fe050d069434a1de3a'
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2007.1.conf2
-rw-r--r--conf/distro/include/angstrom-uclibc.inc3
2 files changed, 4 insertions, 1 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 8b34c89d64..fbce661a42 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -102,6 +102,8 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+#shouldn't that be uclibc-initial????
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc"
#use EABI toolchain
PREFERRED_VERSION_gcc ?= "4.1.1"
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index ee37921af5..96d42f8a93 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -1,7 +1,8 @@
# uclibc:
#fix some iconv issues, needs to be adjusted when doing uclibc builds
+PREFERRED_PROVIDER_virtual/libc = "uclibc"
PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
-PREFERRED_PROVIDER_virtual/libintl ?= "libintl"
+PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"