From 30004ea5a956f0d64cf425aef301c97c7d1b07f0 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 13 Jul 2011 17:47:32 +0100 Subject: 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. (From OE-Core rev: a4824eb8b04c6397e5398c0c4f0428daded8e42e) Signed-off-by: Phil Blundell Signed-off-by: Richard Purdie --- meta/recipes-core/eglibc/eglibc-package.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/eglibc/eglibc-package.inc') 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." -- cgit v1.2.3-54-g00ecf