aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-10-23 14:19:50 +0200
committerKoen Kooi <koen@openembedded.org>2009-10-27 08:57:29 +0100
commit9c4fbd1f708b7564f7dad5fddb27e443bee5b712 (patch)
tree37c9dd118bd2f9d3afa35ff826809caee94544af
parent3499e5b252d8e4b118f6ea6cc406be7e8c22765a (diff)
downloadopenembedded-9c4fbd1f708b7564f7dad5fddb27e443bee5b712.tar.gz
glibc package bbclass: tweak library packaging
libcidn and libmemusage have there own package now Static libs move around a bit: glibc-dev: /usr/lib/libpthread_nonshared.a /usr/lib/libc_nonshared.a glibc-static: /usr/lib/libm.a /usr/lib/libbsd-compat.a /usr/lib/libanl.a /usr/lib/libpthread.a /usr/lib/libcrypt.a /usr/lib/libresolv.a /usr/lib/libutil.a /usr/lib/libieee.a /usr/lib/librt.a /usr/lib/libnsl.a /usr/lib/libdl.a /usr/lib/libc.a /usr/lib/libmcheck.a /usr/lib/libBrokenLocale.a /usr/lib/libg.a
-rw-r--r--recipes/glibc/glibc-package.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass
index 1d7f5cd309..179e41f734 100644
--- a/recipes/glibc/glibc-package.bbclass
+++ b/recipes/glibc/glibc-package.bbclass
@@ -29,7 +29,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc"
# Set this to zero if you don't want ldconfig in the output package
USE_LDCONFIG ?= "1"
-PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
+PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-static glibc-doc glibc-locale libcidn libmemusage libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*"
INSANE_SKIP_glibc-dbg = True
@@ -39,9 +39,11 @@ libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${ba
FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}"
FILES_ldd = "${bindir}/ldd"
FILES_libsegfault = "${base_libdir}/libSegFault*"
+FILES_libcidn = "${base_libdir}/libcidn*.so"
+FILES_libmemusage = "${base_libdir}/libmemusage.so"
FILES_glibc-extra-nss = "${base_libdir}/libnss*"
FILES_sln = "${base_sbindir}/sln"
-FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen"
+FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen ${libdir}/*nonshared.a"
FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*"
FILES_glibc-utils = "${bindir}/* ${sbindir}/*"
FILES_glibc-gconv = "${libdir}/gconv/*"