diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-09-19 09:38:44 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-21 13:42:52 +0100 |
commit | 2fa80ef30e8f806c4604f87fce84df6a5402a05b (patch) | |
tree | 27b397faec7994cfdfbaee111da598521df896c1 /meta | |
parent | 29aa617a489b32f8ecdee1aae1a84a12d28ef715 (diff) | |
download | poky-2fa80ef30e8f806c4604f87fce84df6a5402a05b.tar.gz |
Add a run-time dependency that eglibc support GNU_HASH
RPM checks to see if binaries require GNU_HASH, if they do it adds
an automatic dependency of "rtld(GNU_HASH)". We need to satisfy
this dependency, and we do it by providing rtld(GNU_HASH) in the
package(s) that provide a runtime-linker.
(From OE-Core rev: e150afea5a9af8e1bc5aaecd9eb3fe86d7b79f44)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 3 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.12.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.13.bb | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 469e02de57..519a49c75f 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc | |||
@@ -22,7 +22,8 @@ PKGSUFFIX_virtclass-nativesdk = "-nativesdk" | |||
22 | 22 | ||
23 | PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}" | 23 | PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}" |
24 | 24 | ||
25 | RPROVIDES_${PN} = "glibc${PKGSUFFIX}" | 25 | # The ld.so in this eglibc supports the GNU_HASH |
26 | RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)" | ||
26 | RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" | 27 | RPROVIDES_${PN}-utils = "glibc${PKGSUFFIX}-utils" |
27 | RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" | 28 | RPROVIDES_${PN}-pic = "glibc${PKGSUFFIX}-pic" |
28 | RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" | 29 | RPROVIDES_${PN}-dev = "glibc${PKGSUFFIX}-dev" |
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index a71c4d400d..a9d208b756 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require eglibc.inc | 1 | require eglibc.inc |
2 | 2 | ||
3 | DEPENDS += "gperf-native" | 3 | DEPENDS += "gperf-native" |
4 | PR = "r23" | 4 | PR = "r24" |
5 | 5 | ||
6 | SRCREV = "14158" | 6 | SRCREV = "14158" |
7 | 7 | ||
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index b2da6974a9..b549496c26 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb | |||
@@ -3,7 +3,7 @@ require eglibc.inc | |||
3 | SRCREV = "14157" | 3 | SRCREV = "14157" |
4 | 4 | ||
5 | DEPENDS += "gperf-native" | 5 | DEPENDS += "gperf-native" |
6 | PR = "r14" | 6 | PR = "r15" |
7 | PR_append = "+svnr${SRCPV}" | 7 | PR_append = "+svnr${SRCPV}" |
8 | 8 | ||
9 | EGLIBC_BRANCH="eglibc-2_13" | 9 | EGLIBC_BRANCH="eglibc-2_13" |