Patchwork [1/3] qemu: needs pkg-config

login
register
mail settings
Submitter Thomas Petazzoni
Date Nov. 4, 2012, 4:35 p.m.
Message ID <1352046926-10804-1-git-send-email-thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/197055/
State Accepted
Commit 9874442ee2492944fd78305dd96cd25a63fa1fbe
Headers show

Comments

Thomas Petazzoni - Nov. 4, 2012, 4:35 p.m.
Fixes

  http://autobuild.buildroot.org/results/ccb7d6da503a81015275ff1e4ba9a564203932ec/build-end.log

Even though the build failure happens on host-qemu, adding
host-pkgconf to QEMU_DEPENDENCIES seems like the right thing to do
since that this dependency will also be needed for the target qemu
once it gets included.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/qemu/qemu.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Thomas Petazzoni - Nov. 4, 2012, 5:03 p.m.
On Sun,  4 Nov 2012 17:35:24 +0100, Thomas Petazzoni wrote:

>  define HOST_QEMU_CONFIGURE_CMDS
> -	(cd $(@D); ./configure                          \
> +	(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure   \
>  		--target-list="$(HOST_QEMU_TARGETS)"    \
>  		--prefix="$(HOST_DIR)/usr"              \
>  		--interp-prefix=$(STAGING_DIR)          \

I should have explained this change in the commit log: it is needed so
that $(HOST_DIR)/usr/bin/ is in the PATH, which allows Qemu's configure
script to find our pkg-config.

Thomas
Peter Korsgaard - Nov. 5, 2012, 8:11 a.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Fixes
 Thomas>   http://autobuild.buildroot.org/results/ccb7d6da503a81015275ff1e4ba9a564203932ec/build-end.log

Committed all 3, thanks.

Patch

diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index de72e04..c2c4103 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -8,6 +8,8 @@  QEMU_VERSION = 1.2.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
 QEMU_SITE = http://wiki.qemu.org/download
 
+QEMU_DEPENDENCIES = host-pkgconf
+
 #       BR ARCH         qemu
 #       -------         ----
 #       arm             arm
@@ -53,7 +55,7 @@  endif
 HOST_QEMU_TARGETS=$(QEMU_ARCH)-linux-user
 
 define HOST_QEMU_CONFIGURE_CMDS
-	(cd $(@D); ./configure                          \
+	(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure   \
 		--target-list="$(HOST_QEMU_TARGETS)"    \
 		--prefix="$(HOST_DIR)/usr"              \
 		--interp-prefix=$(STAGING_DIR)          \