Patchwork qemu-native: fix build on hosts without libX11 installed

login
register
mail settings
Submitter Martin Jansa
Date Sept. 22, 2012, 10:30 a.m.
Message ID <1348309833-13334-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/37031/
State Accepted
Commit 6bb6ca6164b6b5f082fe05c30974463c2aa1c170
Headers show

Comments

Martin Jansa - Sept. 22, 2012, 10:30 a.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-devtools/qemu/qemu_1.2.0.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
Saul Wold - Sept. 27, 2012, 4:20 p.m.
On 09/22/2012 03:30 AM, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>   meta/recipes-devtools/qemu/qemu_1.2.0.bb | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/qemu/qemu_1.2.0.bb b/meta/recipes-devtools/qemu/qemu_1.2.0.bb
> index 7091f6d..191ee48 100644
> --- a/meta/recipes-devtools/qemu/qemu_1.2.0.bb
> +++ b/meta/recipes-devtools/qemu/qemu_1.2.0.bb
> @@ -17,7 +17,7 @@ SRC_URI = "\
>   SRC_URI[md5sum] = "78eb1e984f4532aa9f2bdd3c127b5b61"
>   SRC_URI[sha256sum] = "c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936"
>
> -PR = "r1"
> +PR = "r2"
>
>   SRC_URI_append_virtclass-nativesdk = "\
>       file://relocatable_sdk.patch \
> @@ -29,4 +29,8 @@ do_configure_prepend_virtclass-nativesdk() {
>   		sed -i 's/-lX11//g' Makefile.target
>   	fi
>   }
> +do_configure_prepend_virtclass-native() {
> +	# Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed
> +	sed -i 's/-lX11//g' Makefile.target
> +}
>
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-devtools/qemu/qemu_1.2.0.bb b/meta/recipes-devtools/qemu/qemu_1.2.0.bb
index 7091f6d..191ee48 100644
--- a/meta/recipes-devtools/qemu/qemu_1.2.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_1.2.0.bb
@@ -17,7 +17,7 @@  SRC_URI = "\
 SRC_URI[md5sum] = "78eb1e984f4532aa9f2bdd3c127b5b61"
 SRC_URI[sha256sum] = "c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI_append_virtclass-nativesdk = "\
     file://relocatable_sdk.patch \
@@ -29,4 +29,8 @@  do_configure_prepend_virtclass-nativesdk() {
 		sed -i 's/-lX11//g' Makefile.target
 	fi
 }
+do_configure_prepend_virtclass-native() {
+	# Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed
+	sed -i 's/-lX11//g' Makefile.target
+}