[oe] [PATCH] Add eglibc-pic, resync eglibc-dev with glibc

Tom Rini tom_rini at mentor.com
Tue Mar 2 04:20:02 UTC 2010


On Mon, 2010-03-01 at 18:59 -0800, Khem Raj wrote:
> On Mon, Mar 1, 2010 at 6:34 PM, Tom Rini <tom_rini at mentor.com> wrote:
> > eglibc-package.bbclass: Add eglibc-pic, resync eglibc-dev with glibc
> >
> > Resync what goes into eglibc-dev based on what we have in glibc-dev.
> > This includes zoneinfo and picking up the reset of the static libraries
> > (many are missed otherwise and static linking in SDKs fails).  We add in
> > a eglibc-pic package to catch all of the pic stuff (some of which would
> > otherwise be caught in -dev).
> >
> > Will bump PRs when I push this.
> >
> > Signed-off-by: Tom Rini <tom_rini at mentor.com>
> >
> > diff --git a/recipes/eglibc/eglibc-package.bbclass
> > b/recipes/eglibc/eglibc-package.bbclass
> > index 3c33f93..9c660b4 100644
> > --- a/recipes/eglibc/eglibc-package.bbclass
> > +++ b/recipes/eglibc/eglibc-package.bbclass
> > @@ -29,11 +29,12 @@ 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 = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef
> > eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault
> > eglibc-extra-nss eglibc-thread-db eglibc-pcprofile"
> > +PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef
> > eglibc-utils eglibc-pic eglibc-dev eglibc-doc eglibc-locale libcidn
> > libmemusage libsegfault eglibc-extra-nss eglibc-thread-db
> > eglibc-pcprofile"
> >  PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-*
> > glibc-binary-localedata-* eglibc-gconv-* eglibc-charmap-*
> > eglibc-localedata-* eglibc-binary-localedata-* locale-base-*"
> >
> >  RPROVIDES_eglibc = "glibc"
> >  RPROVIDES_eglibc-utils = "glibc-utils"
> > +RPROVIDES_eglibc-pic = "glibc-pic"
> >  RPROVIDES_eglibc-dev = "glibc-dev"
> >  RPROVIDES_eglibc-doc = "glibc-doc"
> >  RPROVIDES_eglibc-locale = "glibc-locale"
> > @@ -43,12 +44,16 @@ RPROVIDES_eglibc-pcprofile = "glibc-pcprofile"
> >  RPROVIDES_eglibc-dbg = "glibc-dbg"
> >  libc_baselibs = "${base_libdir}/libcrypt*.so.*
> > ${base_libdir}/libcrypt-*.so ${base_libdir}/libc*.so.*
> > ${base_libdir}/libc*.so ${base_libdir}/libm*.so.*
> > ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so
> > ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so
> > ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so
> > ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so
> > ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so
> > ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so
> > ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so
> > ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so
> > ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so
> > ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so
> > ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so
> > ${base_libdir}/libBrokenLocale*.so.*
> > ${base_libdir}/libBrokenLocale-*.so"
> >
> > -FILES_${PN} = "${libc_baselibs} ${libexecdir}/*
> > ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '',
> > d)}"
> > +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_eglibc-extra-nss = "${base_libdir}/libnss*"
> >  FILES_sln = "/sbin/sln"
> > -FILES_eglibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen
> > ${libdir}/libc_nonshared.a ${libdir}/libpthread_nonshared.a"
> > +FILES_eglibc-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map
> > ${libdir}/libc_pic/"
> > +FILES_eglibc-dev_append += "${bindir}/rpcgen ${libdir}/*.a \
> > +       ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
> >  FILES_nscd = "${sbindir}/nscd*"
> >  FILES_eglibc-utils = "${bindir}/* ${sbindir}/*"
> >  FILES_eglibc-gconv = "${libdir}/gconv/*"
> > @@ -95,7 +100,6 @@ do_install() {
> >                mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
> >        done
> >        rm -f ${D}/etc/rpc
> > -       rm -rf ${D}${datadir}/zoneinfo
> >        rm -rf ${D}${libexecdir}/getconf
> >  }
> >
> >
> >
> 
> Why is change to not delete zoneinfo needed ? these should be provided
> by tzdata

If we really want, OK, I'll drop that part out.

> for other changes
> 
> Acked-by: Khem Raj <raj.khem at gmail.com>
> 
> > --
> > Tom Rini <tom_rini at mentor.com>
> > Mentor Graphics Corporation
> >


-- 
Tom Rini <tom_rini at mentor.com>
Mentor Graphics Corporation




More information about the Openembedded-devel mailing list