From 4ed1918ec0ebbd0e71a9c2a6c6d352335e121629 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 30 Mar 2019 14:05:01 +0100
Subject: [PATCH] pigz: bump version.

enable for x86 secondary arch.
---
 .../{pigz-2.3.4.recipe => pigz-2.4.recipe}    | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)
 rename app-arch/pigz/{pigz-2.3.4.recipe => pigz-2.4.recipe} (60%)

diff --git a/app-arch/pigz/pigz-2.3.4.recipe b/app-arch/pigz/pigz-2.4.recipe
similarity index 60%
rename from app-arch/pigz/pigz-2.3.4.recipe
rename to app-arch/pigz/pigz-2.4.recipe
index 3839c13c5..875a1f240 100644
--- a/app-arch/pigz/pigz-2.3.4.recipe
+++ b/app-arch/pigz/pigz-2.4.recipe
@@ -11,28 +11,37 @@ systems that provide the zlib and pthread libraries."
 HOMEPAGE="http://www.zlib.net/pigz"
 COPYRIGHT="2008-2013 Mark Adler"
 LICENSE="Zlib"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://www.zlib.net/pigz/pigz-$portVersion.tar.gz"
-CHECKSUM_SHA256="6f031fa40bc15b1d80d502ff91f83ba14f4b079e886bfb83221374f7bf5c8f9a"
+CHECKSUM_SHA256="a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73"
 
-ARCHITECTURES="x86 ?x86_gcc2 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+SECONDARY_ARCHITECTURES="x86"
+fi
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandBinDir=$prefix/bin
+fi
 
 PROVIDES="
-	pigz = $portVersion
+	pigz$secondaryArchSuffix = $portVersion
 	cmd:pigz = $portVersion
 	cmd:unpigz = $portVersion
 	"
 REQUIRES="
-	haiku
-	lib:libz
+	haiku$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libz
+	haiku${secondaryArchSuffix}_devel
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	"
 
@@ -50,8 +59,8 @@ BUILD()
 
 INSTALL()
 {
-	mkdir -p $binDir
-	cp -af pigz unpigz $binDir
+	mkdir -p $commandBinDir
+	cp -af pigz unpigz $commandBinDir
 	mkdir -p $manDir/man1
 	cp -af pigz.1 $manDir/man1
 }