From ccff7343c57a5807cd1fb12d3f0d872c0bfc9eaa Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 6 Oct 2013 11:21:20 +0200
Subject: [PATCH] Make libdsk recipe work in hybrid mode as well.

---
 app-emulation/libdsk/libdsk-1.3.3.recipe | 28 ++++++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/app-emulation/libdsk/libdsk-1.3.3.recipe b/app-emulation/libdsk/libdsk-1.3.3.recipe
index 849cc6970..1bfc83d9d 100644
--- a/app-emulation/libdsk/libdsk-1.3.3.recipe
+++ b/app-emulation/libdsk/libdsk-1.3.3.recipe
@@ -3,12 +3,18 @@ HOMEPAGE="http://www.seasip.demon.co.uk/Unix/LibDsk/"
 SRC_URI="http://www.seasip.info/Unix/LibDsk/libdsk-1.3.3.tar.gz"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 CHECKSUM_MD5="2cce41b4b1325d697183e34afcae2a9c"
 
 PROVIDES="
-	libdsk = $portVersion
-	lib:libdsk = $portVersion
-	devel:libdsk
+	libdsk$secondaryArchSuffix = $portVersion
+	lib:libdsk$secondaryArchSuffix = $portVersion
+	devel:libdsk$secondaryArchSuffix = $portVersion
+	"
+
+
+if [ -z "$secondaryArchSuffix" ]; then
+PROVIDES="$PROVIDES
 	cmd:apriboot
 	cmd:dskdump
 	cmd:dskform
@@ -18,17 +24,20 @@ PROVIDES="
 	cmd:dskutil
 	cmd:md3serial
 	"
+fi
 
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libz
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:libtoolize
 	cmd:autoconf
 	cmd:make
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	"
 
 BUILD()
@@ -37,13 +46,18 @@ BUILD()
 	libtoolize --install --copy --force
 	autoconf
 	runConfigure ./configure
-	make
+	make $jobArgs
 }
 
 INSTALL()
 {
 	make install
 
+	# remove command for secondary architecture
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+	fi
+
 	prepareInstalledDevelLib libdsk
 }