[OE-core] [oe-commits] Cristian Iorga : qemu: fix qemu-native pkg-config paths

[Martin Jansa]

On Fri, Jul 18, 2014 at 10:50:12PM +0200, Martin Jansa wrote:
> On Thu, Jul 03, 2014 at 04:47:08PM +0000, git at git.openembedded.org wrote:
> > Module: openembedded-core.git
> > Branch: master
> > Commit: 68a5ed337f8f7ee8e5bf55542ec82d786eb754db
> > URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=68a5ed337f8f7ee8e5bf55542ec82d786eb754db
> > 
> > Author: Cristian Iorga <cristian.iorga at intel.com>
> > Date:   Thu Jul  3 15:57:32 2014 +0300
> > 
> > qemu: fix qemu-native pkg-config paths
> > 
> > For qemu-native, the pkg-config paths do not
> > include build host paths.
> 
> This breaks qemu-native builds on hosts without pkg-config.
> 
> pkg-config isn't in sanity.bbclass's SANITY_REQUIRED_UTILITIES
> and this is first recipe which cannot use pkgconfig-native.
> 
> Please add test that it exists before forcing recipe to use it.

ping

> > This is an issue for libsdl for example, where SDL is
> > used by qemu, but for qemu-native libsdl-native is not
> > built, but assumed to be provided by the build host.
> > Because pkg-config do not search for libsdl config files
> > on the build host sysroot, the configure stage of qemu-native
> > will fail because it will not find SDL as being installed.
> > Usually, the isssue is masked by a functional sdl-config that
> > will be interogated instead of pkg-config. However, on Build
> > Appliance, sdl-config is deliberately made non-functional,
> > so the issue manifests itself.
> > 
> > The fix will create an extended PKG_CONFIG_PATH, which does
> > include the build host sysroot paths for pkg-config.
> > 
> > Fix for [YOCTO #6495].
> > 
> > Signed-off-by: Cristian Iorga <cristian.iorga at intel.com>
> > Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> > 
> > ---
> > 
> >  meta/recipes-devtools/qemu/qemu.inc | 4 ++++
> >  1 file changed, 4 insertions(+)
> > 
> > diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
> > index 076e8ad..611ee61 100644
> > --- a/meta/recipes-devtools/qemu/qemu.inc
> > +++ b/meta/recipes-devtools/qemu/qemu.inc
> > @@ -33,6 +33,10 @@ EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disa
> >  export LIBTOOL="${HOST_SYS}-libtool"
> >  
> >  do_configure_prepend_class-native() {
> > +	# Append build host pkg-config paths for native target since the host may provide sdl
> > +	BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config)
> > +	export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
> > +
> >  	# Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed
> >  	sed -i 's/-lX11//g' Makefile.target
> >  }
> > 
> > -- 
> > _______________________________________________
> > 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20140725/5fcacb1c/attachment-0002.sig>