From 070512abccf28f012713ffc65202fed22518fd43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Sun, 4 Dec 2016 18:15:06 +0100
Subject: [PATCH] linaro_qemu: fix provide,requires,build_requires.

* disable stack protector.
---
 .../linaro_qemu/linaro_qemu-2014.01.recipe    | 18 +++++------
 .../linaro_qemu/patches/qemu-2.0.0.patchset   | 31 +++++++++++++++++++
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe b/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe
index 325f8c9c3..40415dd44 100644
--- a/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe
+++ b/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe
@@ -8,7 +8,7 @@ achieves very good performance."
 HOMEPAGE="http://wiki.qemu.org/"
 COPYRIGHT="2003-2014 Fabrice Bellard"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://launchpad.net/qemu-linaro/trunk/2014.01/+download/qemu-linaro-1.7.0-2014.01.tar.gz"
 CHECKSUM_SHA256="bd9a2266dd6abc5da8bac1ec9eadd728693911bbfbfe26d2a464e068ad6afd70"
 SOURCE_DIR="qemu-linaro-1.7.0-2014.01"
@@ -18,7 +18,7 @@ ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	qemu$secondaryArchSuffix = $portVersion
+	linaro_qemu$secondaryArchSuffix = $portVersion
 	cmd:qemu$secondaryArchSuffix = $portVersion
 	cmd:qemu_img$secondaryArchSuffix = $portVersion
 	cmd:qemu_io$secondaryArchSuffix = $portVersion
@@ -52,19 +52,19 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
+	lib:libglib_2.0$secondaryArchSuffix >= 0.1200
 	lib:libintl$secondaryArchSuffix
-	lib:libsdl$secondaryArchSuffix
-	glib2$secondaryArchSuffix >= 2.12
-	pixman$secondaryArchSuffix
+	lib:libSDL_1.2$secondaryArchSuffix
+	lib:libpixman_1$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	devel:libz$secondaryArchSuffix
 	devel:libfdt$secondaryArchSuffix
+	devel:libglib_2.0$secondaryArchSuffix >= 0.1200
 	devel:libsdl$secondaryArchSuffix
-	glib2${secondaryArchSuffix}_devel >= 2.12
-	pixman${secondaryArchSuffix}_devel
+	devel:libpixman_1${secondaryArchSuffix}
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
diff --git a/app-emulation/linaro_qemu/patches/qemu-2.0.0.patchset b/app-emulation/linaro_qemu/patches/qemu-2.0.0.patchset
index 052dffe1b..47b53404e 100644
--- a/app-emulation/linaro_qemu/patches/qemu-2.0.0.patchset
+++ b/app-emulation/linaro_qemu/patches/qemu-2.0.0.patchset
@@ -173,3 +173,34 @@ index 4febfe9..5579646 100644
 -- 
 1.8.3.4
 
+From 1df13c3934df011fe829d2e9b9c39bc2a809cffa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
+Date: Sun, 4 Dec 2016 18:06:30 +0100
+Subject: [PATCH] disable stack-protector.
+
+---
+ configure | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index f997c1c..e01b3b7 100755
+--- a/configure
++++ b/configure
+@@ -1297,10 +1297,10 @@ for flag in $gcc_flags; do
+     fi
+ done
+ 
+-if compile_prog "-Werror -fstack-protector-all" "" ; then
+-    QEMU_CFLAGS="$QEMU_CFLAGS -fstack-protector-all"
+-    LIBTOOLFLAGS="$LIBTOOLFLAGS -Wc,-fstack-protector-all"
+-fi
++#if compile_prog "-Werror -fstack-protector-all" "" ; then
++#   QEMU_CFLAGS="$QEMU_CFLAGS -fstack-protector-all"
++#    LIBTOOLFLAGS="$LIBTOOLFLAGS -Wc,-fstack-protector-all"
++#fi
+ 
+ # Workaround for http://gcc.gnu.org/PR55489.  Happens with -fPIE/-fPIC and
+ # large functions that use global variables.  The bug is in all releases of
+-- 
+2.7.4
+