summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-06-14 20:49:13 +0000
committerRichard Purdie <richard@openedhand.com>2007-06-14 20:49:13 +0000
commit8485dfb4403c8a0b79a2add94ca29974e1fbdd1f (patch)
tree41bb8212332d608aca757f78d6518842f0c8dc19
parent0f5900dabe6d7b22ba8b99c9bc66a85cc177ba26 (diff)
downloadpoky-8485dfb4403c8a0b79a2add94ca29974e1fbdd1f.tar.gz
external_toolchain: Various fixes.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1949 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/external_toolchain.conf4
-rw-r--r--meta/packages/meta/external-poky-toolchain.bb2
-rw-r--r--meta/packages/tasks/task-sdk.bb11
3 files changed, 12 insertions, 5 deletions
diff --git a/meta/conf/external_toolchain.conf b/meta/conf/external_toolchain.conf
index 8f544183d0..b82f3fb63d 100644
--- a/meta/conf/external_toolchain.conf
+++ b/meta/conf/external_toolchain.conf
@@ -2,7 +2,7 @@ TARGET_VENDOR = "-poky"
2 2
3EXTERNAL_TOOLCHAIN = "/usr/local/poky/${TARGET_ARCH}" 3EXTERNAL_TOOLCHAIN = "/usr/local/poky/${TARGET_ARCH}"
4 4
5PATH =+ ":${EXTERNAL_TOOLCHAIN}/bin:" 5PATH =. ":${EXTERNAL_TOOLCHAIN}/bin:"
6 6
7PREFERRED_PROVIDER_linux-libc-headers = "external-poky-toolchain" 7PREFERRED_PROVIDER_linux-libc-headers = "external-poky-toolchain"
8PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-gcc = "external-poky-toolchain" 8PREFERRED_PROVIDER_virtual/arm-poky-linux-gnueabi-gcc = "external-poky-toolchain"
@@ -15,7 +15,7 @@ PREFERRED_PROVIDER_virtual/libiconv = "external-poky-toolchain"
15PREFERRED_PROVIDER_glibc-thread-db = "external-poky-toolchain" 15PREFERRED_PROVIDER_glibc-thread-db = "external-poky-toolchain"
16PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-poky-toolchain" 16PREFERRED_PROVIDER_virtual/linux-libc-headers = "external-poky-toolchain"
17 17
18TARGET_CPPFLAGS_prepend = " -I${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include " 18TARGET_CPPFLAGS_prepend = " -isystem${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/include "
19TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib " 19TARGET_LDFLAGS_prepend = " -L${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib -Wl,-rpath-link,${EXTERNAL_TOOLCHAIN}/${TARGET_SYS}/lib "
20 20
21 21
diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb
index 1042191344..bcd8686b90 100644
--- a/meta/packages/meta/external-poky-toolchain.bb
+++ b/meta/packages/meta/external-poky-toolchain.bb
@@ -9,7 +9,7 @@ PROVIDES = "\
9 virtual/libiconv \ 9 virtual/libiconv \
10 glibc-thread-db \ 10 glibc-thread-db \
11 virtual/linux-libc-headers " 11 virtual/linux-libc-headers "
12 12RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
13PACKAGES_DYNAMIC = "glibc-gconv-*" 13PACKAGES_DYNAMIC = "glibc-gconv-*"
14PR = "r1" 14PR = "r1"
15 15
diff --git a/meta/packages/tasks/task-sdk.bb b/meta/packages/tasks/task-sdk.bb
index fee2be51b8..92cb120b05 100644
--- a/meta/packages/tasks/task-sdk.bb
+++ b/meta/packages/tasks/task-sdk.bb
@@ -1,5 +1,5 @@
1DESCRIPTION = "SDK packages" 1DESCRIPTION = "SDK packages"
2PR = "r7" 2PR = "r9"
3LICENSE = "MIT" 3LICENSE = "MIT"
4ALLOW_EMPTY = "1" 4ALLOW_EMPTY = "1"
5 5
@@ -10,5 +10,12 @@ PACKAGES = "\
10RDEPENDS_task-sdk-bare = "\ 10RDEPENDS_task-sdk-bare = "\
11 glibc \ 11 glibc \
12 glibc-dev \ 12 glibc-dev \
13 glibc-utils \
14 libsegfault \
15 glibc-thread-db \
16 glibc-gconv-iso8859-1 \
17 glibc-localedata-i18n \
18 locale-base-en-gb \
13 libgcc1 \ 19 libgcc1 \
14 " \ No newline at end of file 20 libstdc++ \
21 "