From 7f69e026349f74c644927a9112ab8bbaa78e6463 Mon Sep 17 00:00:00 2001
From: Nav <nav@unlicrea.com>
Date: Sun, 14 Dec 2014 00:44:24 +0200
Subject: [PATCH] Fixed apr_util-1.5.4 recipe for x86 build

---
 dev-libs/apr_util/apr_util-1.5.4.recipe | 36 ++++++++++++-------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/dev-libs/apr_util/apr_util-1.5.4.recipe b/dev-libs/apr_util/apr_util-1.5.4.recipe
index 175ba1f1f..14c99b0f6 100644
--- a/dev-libs/apr_util/apr_util-1.5.4.recipe
+++ b/dev-libs/apr_util/apr_util-1.5.4.recipe
@@ -16,30 +16,31 @@ LICENSE="Apache v2"
 COPYRIGHT="2011 The Apache Software Foundation."
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PATCHES="apr_util-1.5.3.patch"
 
 PROVIDES="
-	apr_util = $portVersion compat >= 1
-	lib:libaprutil_1 = 0.5.4 compat >= 0
+	apr_util$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0
 	"
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libapr_1
-	lib:libexpat
-	lib:libiconv
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libapr_1$secondaryArchSuffix
+	lib:libexpat$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libapr_1 >= 0.5.0
-	devel:libexpat
-	devel:libiconv
+	devel:libapr_1$secondaryArchSuffix >= 0.5.0
+	devel:libexpat$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:autoheader
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
@@ -54,8 +55,7 @@ PATCH()
 
 BUILD()
 {
-	aprInstallDir=$portPackageLinksDir/lib~libapr_1
-	expatInstallDir=$portPackageLinksDir/lib~libexpat
+	expatInstallDir=$portPackageLinksDir/lib~libexpat$secondaryArchSuffix
 
 	rm -rf aclocal.m4
 	mkdir -p m4
@@ -77,7 +77,7 @@ BUILD()
 	ln -sfn $sourceDir/libtool /libtool
 
 	runConfigure ./configure \
-		--with-apr=$aprInstallDir \
+		--with-apr=/$relativeBinDir \
 		--with-expat=$expatInstallDir
 	make $jobArgs
 }
@@ -108,10 +108,10 @@ INSTALL()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	apr_util_devel = portVersion compat >= 1
-	cmd:apu_1_config = $portVersion compat >= 1
-	devel:libaprutil_1 = 0.5.4 compat >= 0
+	apr_util_devel$secondaryArchSuffix = portVersion compat >= 1
+	cmd:apu_1_config$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0
 	"
 REQUIRES_devel="
-	apr_util == $portVersion base
+	apr_util$secondaryArchSuffix == $portVersion base
 	"