| Submitter | Saul Wold |
|---|---|
| Date | July 11, 2011, 11:13 p.m. |
| Message ID | <e5fe3daf894671d811f8596b427b980d6ead363f.1310425837.git.sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/7397/ |
| State | New, archived |
| Headers | show |
Comments
Op 12 jul 2011, om 01:13 heeft Saul Wold het volgende geschreven: > This will ensure correct -dev and -staticdev packging Missing PR bump > > Signed-off-by: Saul Wold <sgw@linux.intel.com> > --- > meta/recipes-core/glibc/glibc-package.inc | 12 ++++++++---- > 1 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc > index c1c3853..5337de5 100644 > --- a/meta/recipes-core/glibc/glibc-package.inc > +++ b/meta/recipes-core/glibc/glibc-package.inc > @@ -20,13 +20,14 @@ PKGSUFFIX_virtclass-nativesdk = "-nativesdk" > PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} \ > ldd${PKGSUFFIX} ${PN}-utils ${PN}-dev ${PN}-doc \ > libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \ > - ${PN}-pcprofile" > + ${PN}-pcprofile ${PN}-staticdev" > > libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* \ > ${base_libdir}/libpthread* ${base_libdir}/libresolv* ${base_libdir}/librt* \ > ${base_libdir}/libutil* ${base_libdir}/libnsl* ${base_libdir}/libnss_files* \ > ${base_libdir}/libnss_compat* ${base_libdir}/libnss_dns* ${base_libdir}/libdl* \ > - ${base_libdir}/libanl* ${base_libdir}/libBrokenLocale*" > + ${base_libdir}/libanl* ${base_libdir}/libBrokenLocale* \ > + ${base_libdir}/lib*nonshared.a" > > # The problem is that if PN = "glibc", FILES_${PN} will overwrite FILES_glibc > # Solution: Make them both the same thing, then it doesn't matter > @@ -37,8 +38,9 @@ glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \ > ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \ > ${libdir}/gconv/.debug ${libexecdir}/*/.debug" > glibcdevfiles = "${bindir}/rpcgen ${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ > - ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ > - ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" > + ${libdir}/*.o ${libdir}/pkgconfig ${base_libdir}/*.o ${datadir}/aclocal" > + > +glibcstaticdev = "${libdir}/*.a ${base_libdir}/*.a" > > FILES_glibc = "${glibcfiles}" > FILES_${PN} = "${glibcfiles}" > @@ -48,6 +50,8 @@ FILES_glibc-extra-nss = "${base_libdir}/libnss*" > FILES_sln = "${base_sbindir}/sln" > FILES_glibc-dev = "${glibcdevfiles}" > FILES_${PN}-dev = "${glibcdevfiles}" > +FILES_glibc-staticdev = "${glibcstaticdev}" > +FILES_${PN}-staticdev = "${glibcstaticdev}" > FILES_glibc-dbg = "${glibcdbgfiles}" > FILES_${PN}-dbg = "${glibcdbgfiles}" > FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*" > -- > 1.7.3.4 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Patch
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index c1c3853..5337de5 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -20,13 +20,14 @@ PKGSUFFIX_virtclass-nativesdk = "-nativesdk" PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} \ ldd${PKGSUFFIX} ${PN}-utils ${PN}-dev ${PN}-doc \ libsegfault${PKGSUFFIX} ${PN}-extra-nss ${PN}-thread-db \ - ${PN}-pcprofile" + ${PN}-pcprofile ${PN}-staticdev" libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* \ ${base_libdir}/libpthread* ${base_libdir}/libresolv* ${base_libdir}/librt* \ ${base_libdir}/libutil* ${base_libdir}/libnsl* ${base_libdir}/libnss_files* \ ${base_libdir}/libnss_compat* ${base_libdir}/libnss_dns* ${base_libdir}/libdl* \ - ${base_libdir}/libanl* ${base_libdir}/libBrokenLocale*" + ${base_libdir}/libanl* ${base_libdir}/libBrokenLocale* \ + ${base_libdir}/lib*nonshared.a" # The problem is that if PN = "glibc", FILES_${PN} will overwrite FILES_glibc # Solution: Make them both the same thing, then it doesn't matter @@ -37,8 +38,9 @@ glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \ ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \ ${libdir}/gconv/.debug ${libexecdir}/*/.debug" glibcdevfiles = "${bindir}/rpcgen ${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ - ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" + ${libdir}/*.o ${libdir}/pkgconfig ${base_libdir}/*.o ${datadir}/aclocal" + +glibcstaticdev = "${libdir}/*.a ${base_libdir}/*.a" FILES_glibc = "${glibcfiles}" FILES_${PN} = "${glibcfiles}" @@ -48,6 +50,8 @@ FILES_glibc-extra-nss = "${base_libdir}/libnss*" FILES_sln = "${base_sbindir}/sln" FILES_glibc-dev = "${glibcdevfiles}" FILES_${PN}-dev = "${glibcdevfiles}" +FILES_glibc-staticdev = "${glibcstaticdev}" +FILES_${PN}-staticdev = "${glibcstaticdev}" FILES_glibc-dbg = "${glibcdbgfiles}" FILES_${PN}-dbg = "${glibcdbgfiles}" FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*"
This will ensure correct -dev and -staticdev packging Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta/recipes-core/glibc/glibc-package.inc | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)