On Wed, Nov 28, 2012 at 09:06:00AM +0000, Richard Purdie wrote:
> On Wed, 2012-11-28 at 09:57 +0100, Martin Jansa wrote:
> > On Tue, Nov 27, 2012 at 12:44:21PM -0600, Mark Hatle wrote:
> > > On 11/27/12 12:23 PM, Martin Jansa wrote:
> > > > In last rebuild from scratch I've noticed couple of weird locale data:
> > >
> > > Paul E and I just observed this as well... My build machine is an -old-
> > > FC13
> > > machine.. system we found it on was x86.
> >
> > OK, the issue is triggered by:
> >
> > commit 841ea3c1c18e50e77fccbd5f44d6a79a50913b67
> > Author: Richard Purdie <richard.pur...@linuxfoundation.org>
> > Date: Thu Oct 11 08:43:01 2012 +0000
> >
> > autotools.bbclass: Fix gettext macro versions issues
> >
> > Especially this part:
> > -if [ -d ${S}/po/ -a ! -e ${S}/po/Makefile.in.in ]; then
> > - cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
> > +if [ -d ${S}/po/ ]; then
> > + cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
> >
> > And it influences gst* because they are hacking their po/Makefile.in.in in
> > autogen.sh by this patch
> > http://cgit.freedesktop.org/gstreamer/common/commit/gettext.patch?id=c81ad072c76522175cbddead96d6f3c448068d67
> >
> > RP: do you remember why you removed "-e ${S}/po/Makefile.in.in" check?
> > I guess it was because it can be from older gettext version (in gstreamer
> > case 0.17 instead of our 0.18)
>
> Right, we have to ensure the file is the 0.18 version, whether it exists
> already or not otherwise we get version mismatch issues.
>
> > Is there some way to inject Makefile.in.in modification between this
> > gettext modifications and running autoreconf/configure? I don't see any
> > in run.do_configure, but I guess there is cleaner solution for upstream
> > to use.
> >
> > As work around we can replace DOMAIN setting in po/Makevars in all gst*
> > packages.
>
> I don't quite understand what you mean here?
po/Makevars in gst* is using:
DOMAIN = $(GETTEXT_PACKAGE)
we can call
sed 's/$(GETTEXT_PACKAGE)/gstreamer-0.10/g' ${S}/po/Makevars
in do_configure_prepend
Or read correct "gstreamer-0.10" value from something so it's not
hardcoded in recipe.
Other option is to include the same hack in our Makefile.in.in
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
if we test that this does not break some other packages.
Cheers,
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
