From 4f4bd847472ad37c934c1899df5926b44f376ecf Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sun, 7 Oct 2018 23:47:47 +0000
Subject: [PATCH] patch: add support for x86 secondary arch. (#3200)

---
 sys-devel/patch/patch-2.7.5.recipe | 34 +++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/sys-devel/patch/patch-2.7.5.recipe b/sys-devel/patch/patch-2.7.5.recipe
index 625861f7e..13eb1a1f4 100644
--- a/sys-devel/patch/patch-2.7.5.recipe
+++ b/sys-devel/patch/patch-2.7.5.recipe
@@ -11,34 +11,48 @@ SOURCE_URI="http://ftp.gnu.org/pub/gnu/patch/patch-$portVersion.tar.gz"
 CHECKSUM_SHA256="7436f5a19f93c3ca83153ce9c5cbe4847e97c5d956e57a220121e741f6e7968f"
 PATCHES="patch-$portVersion.patchset"
 
-ARCHITECTURES="x86 x86_gcc2 x86_64 arm"
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+SECONDARY_ARCHITECTURES="x86"
+fi
 
 PROVIDES="
-	patch = $portVersion
+	patch$secondaryArchSuffix = $portVersion
 	cmd:patch = $portVersion
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
+	"
+if [ -n "$secondaryArchSuffix" ]; then
+CONFLICTS="
+	patch
+	"
+fi
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
 
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:awk
-	cmd:gcc
+TEST_REQUIRES="
+	cmd:diff
 	cmd:git
-	cmd:make
 	"
 
 BUILD()
 {
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure --bindir="$prefix"/bin
 	make
 }
 
 INSTALL()
 {
 	make install
-	rm $libDir/charset.alias
+	rm "$libDir"/charset.alias
 }
 
 TEST()