On Fri, Dec 19, 2014 at 06:08:41PM +0000, g...@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.toller...@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 > > Signed-off-by: Richard Tollerton <rich.toller...@ni.com> > Signed-off-by: Ross Burton <ross.bur...@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-comm...@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-commits -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core