From e23eb853d7f5cccb1c16f17c89135a8767bbf014 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Fri, 9 Aug 2013 01:11:23 +0200
Subject: [PATCH] jpeg: support building for secondary architecture

---
 media-libs/jpeg/jpeg-9.recipe | 68 +++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 30 deletions(-)

diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe
index 9138566d4..232f6d297 100644
--- a/media-libs/jpeg/jpeg-9.recipe
+++ b/media-libs/jpeg/jpeg-9.recipe
@@ -13,34 +13,33 @@ LICENSE="JPEG"
 COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding.  All Rights Reserved"
 SRC_URI="http://www.ijg.org/files/jpegsrc.v9.tar.gz"
 CHECKSUM_MD5="b397211ddfd506b92cd5e02a22ac924d"
-REVISION="2"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="3"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="jpeg-9.patchset"
 
 PROVIDES="
-	jpeg = $portVersion compat >= 9
-	lib:libjpeg = $portVersion compat >= 9
+	jpeg$secondaryArchSuffix = $portVersion compat >= 9
+	lib:libjpeg$secondaryArchSuffix = $portVersion compat >= 9
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:grep
-	cmd:ld
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
-
 BUILD()
 {
 	aclocal
@@ -63,34 +62,43 @@ INSTALL()
 		$developDir
 
 	# tools package
-	packageEntries tools \
-		$binDir \
-		$documentationDir
+	if [ -z "$secondaryArchSuffix" ]; then
+		packageEntries tools \
+			$binDir \
+			$documentationDir
+	fi
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
 }
 
 # ----- devel package -------------------------------------------------------
 
-SUMMARY_devel="The JPEG development files"
 PROVIDES_devel="
-	jpeg_devel = $portVersion compat >= 9
-	devel:libjpeg = $portVersion compat >= 9
+	jpeg${secondaryArchSuffix}_devel = $portVersion compat >= 9
+	devel:libjpeg$secondaryArchSuffix = $portVersion compat >= 9
 	"
 REQUIRES_devel="
-	jpeg == $portVersion base
+	jpeg$secondaryArchSuffix == $portVersion base
 	"
 
 # ----- tools package -------------------------------------------------------
 
-SUMMARY_tools="The JPEG tools"
-PROVIDES_tools="
-	jpeg_tools = $portVersion compat >= 9
-	cmd:cjpeg = $portVersion compat >= 9
-	cmd:djpeg = $portVersion compat >= 9
-	cmd:jpegtran = $portVersion compat >= 9
-	cmd:rdjpgcom = $portVersion compat >= 9
-	cmd:wrjpgcom = $portVersion compat >= 9
-	"
-REQUIRES_tools="
-	haiku >= $haikuVersion
-	jpeg == $portVersion base
-	"
+if [ -z "$secondaryArchSuffix" ]; then
+	SUMMARY_tools="The JPEG tools"
+	PROVIDES_tools="
+		jpeg_tools = $portVersion compat >= 9
+		cmd:cjpeg = $portVersion compat >= 9
+		cmd:djpeg = $portVersion compat >= 9
+		cmd:jpegtran = $portVersion compat >= 9
+		cmd:rdjpgcom = $portVersion compat >= 9
+		cmd:wrjpgcom = $portVersion compat >= 9
+		"
+	REQUIRES_tools="
+		haiku >= $haikuVersion
+		jpeg == $portVersion base
+		"
+fi