From b2daa71240a7d2d827a5704cd08eef40ea39f8c3 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 19 Apr 2014 23:41:18 +0200
Subject: [PATCH] bison 2.5: hybrid build support.

---
 sys-devel/bison/bison-2.5.recipe | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/sys-devel/bison/bison-2.5.recipe b/sys-devel/bison/bison-2.5.recipe
index 4770240af..b200f470d 100644
--- a/sys-devel/bison/bison-2.5.recipe
+++ b/sys-devel/bison/bison-2.5.recipe
@@ -15,21 +15,30 @@ COPYRIGHT="1992-2011 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.5.tar.gz"
 CHECKSUM_MD5="687e1dcd29452789d34eaeea4c25abe4"
+CHECKSUM_SIZE="2703110"
+CHECKSUM_RMD160="17639a434ac00eb16252850ea8ebd06a356504aa"
+CHECKSUM_SHA512="af7f1f569e2bd2915e807cf5065cea49675f98ddabb201e771a3d48bbe156c2427a4c4e46fcd70fd3328bf7a5d84c45aa1894e99ce27c7a24c59c4aa69d2252a"
 REVISION="1"
 
 ARCHITECTURES="?x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PATCHES="bison-${portVersion}.patch"
 
 PROVIDES="
-	bison = $portVersion compat >= 2.5
-	cmd:bison = $portVersion compat >= 2.5
-	cmd:yacc
-	devel:liby = $portVersion compat >= 2.5
+	bison$secondaryArchSuffix = $portVersion compat >= 2.5
+	cmd:bison$secondaryArchSuffix = $portVersion compat >= 2.5
+	cmd:yacc$secondaryArchSuffix
+	devel:liby$secondaryArchSuffix = $portVersion compat >= 2.5
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	cmd:m4
 	"
 
@@ -37,9 +46,10 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	cmd:gcc
-	cmd:ld
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:awk
 	cmd:m4
 	cmd:make
 	cmd:sed