From b293a9ae2bb12b291bc270df6b4ddee8f0922b13 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Fri, 22 Jun 2018 09:59:59 +0000
Subject: [PATCH] XaoS: fix REQUIRES, add support for x86_gcc2 secondary arch.

* lib:libgsl is neither available nor needed on x86_gcc2.
* XaoS 3.4 fails to build on x86{,_64}, even without libgsl.
---
 haiku-apps/xaos/xaos-3.4.recipe | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/haiku-apps/xaos/xaos-3.4.recipe b/haiku-apps/xaos/xaos-3.4.recipe
index 13b48cabc..49c9eef94 100644
--- a/haiku-apps/xaos/xaos-3.4.recipe
+++ b/haiku-apps/xaos/xaos-3.4.recipe
@@ -32,35 +32,36 @@ SOURCE_DIR="XaoS-release-$portVersion"
 PATCHES="xaos-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 
 PROVIDES="
-	xaos
+	xaos$secondaryArchSuffix = $portVersion
 	app:XaoS = $portVersion
 	"
 REQUIRES="
-	lib:libgsl$secondaryArchSuffix
+	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	"
 if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
-	REQUIRES+="
+REQUIRES+="
 	lib:libgsl$secondaryArchSuffix
 	"
 fi
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	"
 if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
-	BUILD_REQUIRES+="
+BUILD_REQUIRES+="
 	devel:libgsl$secondaryArchSuffix
 	"
 fi
 BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:gcc
-	cmd:libtoolize
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:nasm
 	"