summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/eglibc
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-09-11 19:14:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-12 15:13:42 +0100
commitc460737a30f7930610eaf8c2c842f3ce99d6b122 (patch)
treeff8301d7b49a034219b2a25c88deb68838d14ced /meta/recipes-core/eglibc
parentbb330fdc0076a043694f1fc4b65b345b604afc36 (diff)
downloadpoky-c460737a30f7930610eaf8c2c842f3ce99d6b122.tar.gz
eglibc: Restore ${PN} to before ${PN}-dev in PACKAGES
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. (From OE-Core rev: ec3ec1e7388c2175f41527d5e5e07c6bb14a8f6e) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc')
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.16.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index edf7a759e6..ab7540afb4 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -17,7 +17,7 @@ python __anonymous () {
17# Set this to zero if you don't want ldconfig in the output package 17# Set this to zero if you don't want ldconfig in the output package
18USE_LDCONFIG ?= "1" 18USE_LDCONFIG ?= "1"
19 19
20PACKAGES = "${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" 20PACKAGES = "${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"
21 21
22# The ld.so in this eglibc supports the GNU_HASH 22# The ld.so in this eglibc supports the GNU_HASH
23RPROVIDES_${PN} = "glibc rtld(GNU_HASH)" 23RPROVIDES_${PN} = "glibc rtld(GNU_HASH)"
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index 030b2351bd..78dc44a675 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -3,7 +3,7 @@ require eglibc.inc
3SRCREV = "20393" 3SRCREV = "20393"
4 4
5DEPENDS += "gperf-native kconfig-frontends-native" 5DEPENDS += "gperf-native kconfig-frontends-native"
6PR = "r8" 6PR = "r9"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_16" 9EGLIBC_BRANCH="eglibc-2_16"