From 68a5ed337f8f7ee8e5bf55542ec82d786eb754db Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Thu, 3 Jul 2014 15:57:32 +0300 Subject: qemu: fix qemu-native pkg-config paths For qemu-native, the pkg-config paths do not include build host paths. 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 Signed-off-by: Richard Purdie --- 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 076e8ad929..611ee61beb 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 } -- cgit v1.2.3 d> Holger Hans Peter Freyther zecke@selfish.org 2008-10-15T08:56:42+00:00 c0b6dd9b41279ff00c5a90e49108945a0fee9cdd This is a partial revert of aa03004ace2fabb135a6208ef8c2d2b312aa7b0b. The approach that was taken leads to disagreement and the change was pushed too early. DISTRO_PR is going to say and will be used inside the package creation. There will be more disucssion on the list about where to continue from here.
    This is a partial revert of aa03004ace2fabb135a6208ef8c2d2b312aa7b0b. The
    approach that was taken leads to disagreement and the change was pushed
    too early. DISTRO_PR is going to say and will be used inside the package
    creation. There will be more disucssion on the list about where to continue
    from here.
[PR] Change PR to FILE_PR and intro PR as FILE_PR + DISTRO_PR 2008-10-15T19:41:43+00:00 Holger Hans Peter Freyther zecke@selfish.org 2008-10-15T08:56:42+00:00 aa03004ace2fabb135a6208ef8c2d2b312aa7b0b Allow a distribution to globally bump the PR of every package this is useful when there was a change in the toolchain and every package is going to be different. find packages/ \( -name '*.bb' -or -name '*.inc' \) -exec sed -i s/"^PR="/"FILE_PR ="/ {} \; find packages/ \( -name '*.bb' -or -name '*.inc' \) -exec sed -i s/"^PR ="/"FILE_PR ="/ {} \; Acked-By: Koen Kooi <koen@openembedded.org>
    Allow a distribution to globally bump the PR of every package
    this is useful when there was a change in the toolchain and
    every package is going to be different.

    find packages/ \( -name '*.bb' -or -name '*.inc' \) -exec sed -i s/"^PR="/"FILE_PR ="/ {} \;
    find packages/ \( -name '*.bb' -or -name '*.inc' \) -exec sed -i s/"^PR ="/"FILE_PR ="/ {} \;

Acked-By: Koen Kooi <koen@openembedded.org>
readline_4.3.bb: use ${GNU_MIRROR} instead of hardcoded mirror 2008-05-26T07:24:31+00:00 Jeremy Laine jeremy.laine@m4x.org 2008-05-26T07:24:31+00:00 a61075e60e196d55d3e1f98b9f1e96a9ae8bef25

remove extra whitespace at end-of-line in about 900 bb files. 2006-12-31T13:13:53+00:00 Rolf Leggewie oe-devel@rolf.leggewie.biz 2006-12-31T13:13:53+00:00 f907777709b20d8d73e3587026296a6616262229

Revert the changes from revisions 65af73a95a851d2e8c3cf2f523f1acc488be0208, 28f020502e7dcf566733f474864c62156895baec, 7de90a055904c4af8890dd5ae8c192bfd41b3fa1 2006-01-04T10:36:03+00:00 Richard Purdie rpurdie@rpsys.net 2006-01-04T10:36:03+00:00 bcf39886ed42157c9b5ed692c36014f4fe74168c

autotooled packages: remove custom do_stage 2006-01-02T13:16:14+00:00 Philipp Zabel philipp.zabel@gmail.com 2006-01-02T13:16:14+00:00 ed5dc96cce94e07c31c681ae470b73fd6fb51b2b

ncurse, readline: use autotools_stage_all 2005-09-29T12:09:17+00:00 Michael Lauer mickey@vanille-media.de 2005-09-29T12:09:17+00:00 fa83931aaa6c899c2400e3f47a3b693bb16f5fd8