[OE-core] [oe-commits] Richard Tollerton : font-util: Fix incorrect PKG_CONFIG_PATH

[Richard Tollerton]

Martin Jansa <martin.jansa at gmail.com> writes:

> On Thu, Jan 08, 2015 at 01:01:55PM +0100, Martin Jansa wrote:
> > On Wed, Jan 07, 2015 at 03:12:56PM +0100, Martin Jansa wrote:
> > > On Fri, Dec 19, 2014 at 06:08:41PM +0000, git at git.openembedded.org wrote:
> > > > Module: openembedded-core.git
> > > > Branch: master
> > > > Commit: 89a29a3ad0742cd713e739d3d460be7711966679
> > > > URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=89a29a3ad0742cd713e739d3d460be7711966679
> > > > 
> > > > Author: Richard Tollerton <rich.tollerton at ni.com>
> > > > Date:   Fri Dec 12 13:34:00 2014 -0600
> > > > 
> > > > font-util: Fix incorrect PKG_CONFIG_PATH
> > > > 
> > > > PKG_CONFIG_PATH always defaults to /usr/lib/pkgconfig, and the host
> > > > /usr/lib/pkgconfig is always checked as a fallback; however,
> > > > PKG_CONFIG_PATH is currently (incorrectly) set to /usr/lib/pkg-config in
> > > > the sysroot, which doesn't exist. On host distros where the font
> > > > encoding maps are stored under a different path than OE, this will break
> > > > font builds, because ucs2any will attempt to read the sysroot's encoding
> > > > maps with the host paths.
> > > 
> > > ^ Is this description of what the patch is supposed to fix or expected
> > > side-effect of this change?
> > > 
> > > Because all font recipes and meta-oe are failing since this change with
> > > errors like this:
> > > 
> > > /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/ucs2any:
> > > Can't read mapping file
> > > '/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/share/fonts/X11/util/map-ISO8859-1':
> > > No such file or directory!
> > > 
> > > See http://www.openembedded.org/wiki/Bitbake_World_Status
> > 
> > I can confirm that reverting this patch fixes font-* recipes
> > http://lists.openembedded.org/pipermail/openembedded-core/2015-January/100523.html
>
> Ping

ACK. Sorry, I could've sworn I saw the commit get reverted on
master-next, so I figured this was a lower priority than I indicated in
my previous reply.

This build is broken because my patchset was only partially committed.
"font-util: Fix incorrect PKG_CONFIG_PATH" (the patch you reference
above) was patch 2/3, but patches 1/3 "font-util: remove MAPFILES_PATH
override" and 3/3 "xorg-font-common: fix sysroot injection for encoding
maps" appear to have never been committed. See original thread at e.g.
http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/58846.

Could you try rebuilding with those other two patches?

> > > > Signed-off-by: Richard Tollerton <rich.tollerton at ni.com>
> > > > Signed-off-by: Ross Burton <ross.burton at intel.com>
> > > > 
> > > > ---
> > > > 
> > > >  meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > 
> > > > diff --git a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
> > > > index 8b42991..cc4258a 100644
> > > > --- a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
> > > > +++ b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb
> > > > @@ -17,7 +17,7 @@ RDEPENDS_${PN}_class-native = "mkfontdir-native mkfontscale-native"
> > > >  PR = "${INC_PR}.0"
> > > >  
> > > >  do_configure_prepend() {
> > > > -        sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" ${S}/fontutil.m4.in
> > > > +        sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkgconfig\" pkg-config#g" ${S}/fontutil.m4.in
> > > >  }
> > > >  
> > > >  BBCLASSEXTEND = "native"
> > > > 
> > > > -- 
> > > > _______________________________________________
> > > > Openembedded-commits mailing list
> > > > Openembedded-commits at lists.openembedded.org
> > > > http://lists.openembedded.org/mailman/listinfo/openembedded-commits
> > > 
> > > -- 
> > > Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
> > 
> > 
> > 
> > -- 
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
>
>
>
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com

-- 
Richard Tollerton <rich.tollerton at ni.com>