diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-18 09:15:16 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-18 09:15:16 +0000 |
commit | 216d5f022fa56d81d52118945476a6b9acce0132 (patch) | |
tree | f4d5ba584865e9f3823f15a2ee6a3e673c64e573 /packages/glibc | |
parent | 17b59827785d3f488a9b72d9c9a6d51ba5c933c4 (diff) | |
parent | 9c9415a87de6a1cf058b99d304b31c78e4f31438 (diff) |
merge of '8cde5e5064761c45e322d841a3b3313245cb264a'
and 'd6f1925c439f5b0608c0189c89b17a335f9fbbb6'
Diffstat (limited to 'packages/glibc')
-rw-r--r-- | packages/glibc/glibc.inc | 4 | ||||
-rw-r--r-- | packages/glibc/glibc_2.2.5.bb | 2 | ||||
-rw-r--r-- | packages/glibc/glibc_2.3.2.bb | 1 | ||||
-rw-r--r-- | packages/glibc/glibc_2.3.3.bb | 2 | ||||
-rw-r--r-- | packages/glibc/glibc_2.5.bb | 3 |
5 files changed, 7 insertions, 5 deletions
diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc index 4e785d8275..7078a1c09f 100644 --- a/packages/glibc/glibc.inc +++ b/packages/glibc/glibc.inc @@ -3,3 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" SECTION = "libs" PRIORITY = "required" LICENSE = "LGPL" +PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" + +#this leads to circular deps, so lets not add it yet +#RDEPENDS_ldd += " bash" diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 6f00011d00..75f08be942 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -24,8 +24,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" - # nptl needs unwind support in gcc, which can't be built without glibc. PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES_unslung = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 12db1928c6..1dba326201 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -23,7 +23,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" PROVIDES += "virtual/libintl virtual/libiconv" # nptl needs unwind support in gcc, which can't be built without glibc. diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index 7c2bf09e4e..0db2616a75 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -26,8 +26,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } -PACKAGES = "glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" - # nptl needs unwind support in gcc, which can't be built without glibc. PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES += "virtual/libintl virtual/libiconv" diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index 23230392e9..f9f24bbe7f 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -2,6 +2,9 @@ require glibc.inc ARM_INSTRUCTION_SET = "arm" +PACKAGES_DYNAMIC = "libc6*" +RPROVIDES_${PN}-dev = "libc6-dev" + PR = "r4" # the -isystem in bitbake.conf screws up glibc do_stage |