From 7ff69ce0d9b790d740905e7d3ce0a42af4488c0f Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Wed, 7 Aug 2013 03:14:57 +0200
Subject: [PATCH] zlib: support secondary architecture x86 build

---
 sys-libs/zlib/zlib-1.2.8.recipe | 36 +++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe
index efacef3dd..fda155eff 100644
--- a/sys-libs/zlib/zlib-1.2.8.recipe
+++ b/sys-libs/zlib/zlib-1.2.8.recipe
@@ -5,46 +5,52 @@ COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler"
 LICENSE="Zlib"
 SRC_URI="http://zlib.net/zlib-1.2.8.tar.gz"
 CHECKSUM_MD5="44d667c142d7cda120332623eab69f40"
-REVISION="2"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="3"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	zlib = $portVersion compat >= 1
-	lib:libz = $portVersion compat >= 1
+	zlib$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libz$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:cmake
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:grep
-	cmd:ld
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
-
 PATCH()
 {
+	sed -i 's,${CMAKE_INSTALL_PREFIX}/bin',$binDir, CMakeLists.txt
 	sed -i 's,${CMAKE_INSTALL_PREFIX}/include',$includeDir, CMakeLists.txt
+	sed -i 's,${CMAKE_INSTALL_PREFIX}/lib',$libDir, CMakeLists.txt
 	sed -i 's,${CMAKE_INSTALL_PREFIX}/share/man',$manDir, CMakeLists.txt
 	sed -i 's,${CMAKE_INSTALL_PREFIX}/share/pkgconfig',$developLibDir/pkgconfig, \
-		CMakeLists.txt	
+		CMakeLists.txt
 }
 
 BUILD()
 {
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .
+	rm -rf build
+	mkdir build
+	cd build
+
+	cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix ..
 	make $jobArgs
 }
 
 INSTALL()
 {
+	cd build
 	make install
 
 	prepareInstalledDevelLibs libz
@@ -59,9 +65,9 @@ INSTALL()
 
 SUMMARY_devel="The zlib development files"
 PROVIDES_devel="
-	zlib_devel = $portVersion compat >= 1
-	devel:libz = $portVersion compat >= 1
+	zlib${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libz${secondaryArchSuffix} = $portVersion compat >= 1
 	"
 REQUIRES_devel="
-	zlib == $portVersion base
+	zlib${secondaryArchSuffix} == $portVersion base
 	"