[OE-core] [PATCH 3/3] glibc: ignore for musl/uclibc but only for target recipes

[Khem Raj]

On Apr 29, 2015 1:11 AM, "Richard Purdie" <
richard.purdie at linuxfoundation.org> wrote:
>
> On Tue, 2015-04-28 at 22:34 -0700, Khem Raj wrote:
> > we still need nativesdk  or native recipes for libc to come
> > from glibc, but only be ignored for target recipes types
> >
> > Change-Id: Ibaf8114f2aef63f1eadf493b264e78cd928535a0
> > Signed-off-by: Khem Raj <raj.khem at gmail.com>
> > ---
> >  meta/recipes-core/glibc/glibc-collateral.inc | 3 +++
> >  meta/recipes-core/glibc/glibc_2.21.bb        | 9 +++------
> >  2 files changed, 6 insertions(+), 6 deletions(-)
>
> I'm getting *really* frustrated with the continual changes to these
> lines of code. Can we please figure out something that works, test it
> and make sure that it is the right thing to do, then be done with it.
>
> I'm not merging this for at least a couple of weeks so that we can see
> if it is right or not. I'll revert the last set of changes if that helps
> though.

Revert makes it worse. This makes it better to what we have. World builds
did not show issue. But it shows as we start to build sdk and lsb images
for non glibc systems. It's ok to wait but I have made sure it does not
break glibc. I will run a parse of all possible images in oe-core for musl
and see it works in all cases.
>
> Cheers,
>
> Richard
>
> > diff --git a/meta/recipes-core/glibc/glibc-collateral.inc
b/meta/recipes-core/glibc/glibc-collateral.inc
> > index f82db06..60655eb 100644
> > --- a/meta/recipes-core/glibc/glibc-collateral.inc
> > +++ b/meta/recipes-core/glibc/glibc-collateral.inc
> > @@ -17,3 +17,6 @@ do_compile[noexec] = "1"
> >
> >  do_install[depends] += "virtual/${MLPREFIX}libc:do_populate_sysroot"
> >
> > +COMPATIBLE_HOST_libc-musl_class-target = "null"
> > +COMPATIBLE_HOST_libc-uclibc_class-target = "null"
> > +
> > diff --git a/meta/recipes-core/glibc/glibc_2.21.bb
b/meta/recipes-core/glibc/glibc_2.21.bb
> > index 58a9601..5295ddd 100644
> > --- a/meta/recipes-core/glibc/glibc_2.21.bb
> > +++ b/meta/recipes-core/glibc/glibc_2.21.bb
> > @@ -64,14 +64,11 @@ TARGET_CPPFLAGS =
"-I${STAGING_DIR_TARGET}${includedir}"
> >  GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET
gez_ER bn_BD te_IN es_CR.ISO-8859-1"
> >
> >  #
> > -# We will skip parsing glibc when system C library selection is not
glibc
> > +# We will skip parsing glibc when target system C library selection is
not glibc
> >  # this helps in easing out parsing for non-glibc system libraries
> >  #
> > -python __anonymous () {
> > -    if d.getVar('TCLIBC', True) != "glibc":
> > -        raise bb.parse.SkipPackage("incompatible with %s C library" %
> > -                                   d.getVar('TCLIBC', True))
> > -}
> > +COMPATIBLE_HOST_libc-musl_class-target = "null"
> > +COMPATIBLE_HOST_libc-uclibc_class-target = "null"
> >
> >  EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
> >                  --without-cvs --disable-profile \
> > --
> > 2.1.4
> >
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20150429/b02d5a60/attachment-0002.html>