aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-03-06 13:24:13 +0000
committerRichard Purdie <rpurdie@rpsys.net>2008-03-06 13:24:13 +0000
commit151938cb326f8b63dbd32d9663f35b36e3b482ae (patch)
treedf3b58e312ff997e29489bd3a252a5a25cac1ae0
parent4d25ad47736218ef2c07e8d0dac3d4ba827bbc3a (diff)
parentc6f8cfd3e83ff2fd4c8c7cd93dfa9681bbf46010 (diff)
downloadopenembedded-151938cb326f8b63dbd32d9663f35b36e3b482ae.tar.gz
openembedded-151938cb326f8b63dbd32d9663f35b36e3b482ae.tar.bz2
openembedded-151938cb326f8b63dbd32d9663f35b36e3b482ae.zip
merge of '266509b97479fd932511cb63332861a369849008'
and '794e1f022e3fc8866fcadb5c7158d8521fc62a1c'
-rw-r--r--conf/distro/sharprom-compatible.conf2
-rwxr-xr-xcontrib/angstrom/build-release.sh3
-rw-r--r--packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb5
3 files changed, 10 insertions, 0 deletions
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 463c5d0442..245bf77d6d 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -36,6 +36,8 @@ PREFERRED_PROVIDER_virtual/arm-linux-gcc-2.95 = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/libiconv = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/libintl = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native"
PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 31dd704994..cf5af3073e 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -22,6 +22,9 @@ do_build() {
fi
BUILD_MODE="glibc"
+ echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
+ echo 'ANGSTROM_MODE = "glibc"' >> conf/auto.conf
+
if [ "$BUILD_CLEAN" != "" ]
then
bitbake -c clean $BUILD_CLEAN
diff --git a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
index e52ab34392..aa7c98affd 100644
--- a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
+++ b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
@@ -8,10 +8,15 @@ PROVIDES_sharprom-compatible = "\
virtual/arm-linux-libc-for-gcc \
virtual/arm-linux-binutils \
virtual/libc \
+ virtual/libintl \
+ virtual/libiconv \
virtual/arm-linux-gcc \
virtual/arm-linux-gcc-initial "
PR = "r1"
+RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+PACKAGES_DYNAMIC = "glibc-gconv-*"
+
# This needs to be extracted to /usr/local/arm :
# SRC_URI = "http://handhelds.org/download/projects/toolchain/archive/cross-2.95.3.tar.bz2"