| Submitter | Phil Blundell |
|---|---|
| Date | Sept. 11, 2012, 6:04 p.m. |
| Message ID | <1347386679.29443.33.camel@x121e.pbcl.net> |
| Download | mbox | patch |
| Permalink | /patch/36345/ |
| State | New |
| Headers | show |
Comments
Ah right, yeah, I guess so. Thanks, I'll re-send. Do we have any roadmap for getting to a point where we don't need to keep bumping PR by hand anymore? p. On Tue, 2012-09-11 at 20:09 +0200, Martin Jansa wrote: > Missing PR bumps? > > On Tue, Sep 11, 2012 at 8:04 PM, Phil Blundell <philb@gnu.org> wrote: > > Commit 13544fbc6217fee1731a6da1e2cf94901a500842 changed the ordering > > of PACKAGES so that ${PN}-dev came before ${PN}. However, this caused > > the FILES matching to go wrong if ${libdir} == ${base_libdir}. Fix this > > by moving ${PN} ahead of ${PN}-dev once again.
Patch
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index edf7a75..adf31de 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -17,7 +17,7 @@ python __anonymous () { # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" -PACKAGES = "${PN}-dbg catchsegv sln nscd ldd ${PN}-mtrace ${PN}-utils eglibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN} eglibc-extra-nss" +PACKAGES = "${PN}-dbg catchsegv sln nscd ldd ${PN}-mtrace ${PN}-utils eglibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} eglibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" # The ld.so in this eglibc supports the GNU_HASH RPROVIDES_${PN} = "glibc rtld(GNU_HASH)"
Commit 13544fbc6217fee1731a6da1e2cf94901a500842 changed the ordering of PACKAGES so that ${PN}-dev came before ${PN}. However, this caused the FILES matching to go wrong if ${libdir} == ${base_libdir}. Fix this by moving ${PN} ahead of ${PN}-dev once again. Signed-off-by: Phil Blundell <pb@pbcl.net> --- meta/recipes-core/eglibc/eglibc-package.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)