diff options
| author | Phil Blundell <philb@gnu.org> | 2011-07-13 17:47:32 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-14 15:12:04 +0100 |
| commit | a4824eb8b04c6397e5398c0c4f0428daded8e42e (patch) | |
| tree | 46b19517c96ce9bb64b53c24278a21ff1f5c972c | |
| parent | 42cc35d1103c82e6e1f9aefc60bbea518ccc0768 (diff) | |
| download | openembedded-core-a4824eb8b04c6397e5398c0c4f0428daded8e42e.tar.gz openembedded-core-a4824eb8b04c6397e5398c0c4f0428daded8e42e.tar.bz2 openembedded-core-a4824eb8b04c6397e5398c0c4f0428daded8e42e.zip | |
eglibc: fix packaging of thread_db
Similarly to libnss*, if ${libdir} and ${base_libdir} were the same path then
libthread_db would land in ${PN}-dev rather than the intended place. As before,
fix this by moving eglibc-thread-db earlier in PACKAGES and adjusting its FILES
to not capture the .so symlink.
Bump PR for both 2.12 and 2.13.
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 4 | ||||
| -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, 4 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 344f5e4ee3..faf68f70b3 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -20,7 +20,7 @@ USE_LDCONFIG ?= "1" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" -PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss ${PN}-pic ${PN}-dev eglibc-doc libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} eglibc-pcprofile libsotruss${PKGSUFFIX}" +PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev eglibc-doc libcidn libmemusage libsegfault${PKGSUFFIX} eglibc-pcprofile libsotruss${PKGSUFFIX}" # Create a eglibc-binaries ALLOW_EMPTY_${PN}-binaries = "1" @@ -71,7 +71,7 @@ FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv" RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault" RDEPENDS_eglibc-utils += "bash" FILES_eglibc-pcprofile = "${base_libdir}/libpcprofile.so" -FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db*" +FILES_eglibc-thread-db${PKGSUFFIX} = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" RPROVIDES_eglibc-dev += "libc-dev" SUMMARY_sln = "The static ln." diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index fd7b485f61..1ada8927b0 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -PR = "r19" +PR = "r20" SRCREV = "14158" diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index feaf7ca351..6076ab9b44 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb @@ -4,7 +4,7 @@ SRCREV = "14157" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" -PR = "r7" +PR = "r8" PR_append = "+svnr${SRCPV}" EGLIBC_BRANCH="eglibc-2_13" |