From d5a74263b13667b41c6a1bf9d22207da38b9e631 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 10 Jun 2014 19:13:28 +0200
Subject: [PATCH] libsndfile: fix hybrid build

---
 .../libsndfile/libsndfile-1.0.25.recipe       | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/media-libs/libsndfile/libsndfile-1.0.25.recipe b/media-libs/libsndfile/libsndfile-1.0.25.recipe
index a29838aa7..723895751 100644
--- a/media-libs/libsndfile/libsndfile-1.0.25.recipe
+++ b/media-libs/libsndfile/libsndfile-1.0.25.recipe
@@ -8,27 +8,32 @@ COPYRIGHT="
 	1999-2011 Erik de Castro Lopo
 "
 LICENSE="GNU LGPL v2.1"
-SRC_URI="http://www.mega-nerd.com/libsndfile/files/$portVersionedName.tar.gz"
+SRC_URI="http://www.mega-nerd.com/libsndfile/files/libsndfile-$portVersion.tar.gz"
 CHECKSUM_SHA256="59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882"
 REVISION="2"
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
 PATCHES="libsndfile-$portVersion.patchset"
 
 PROVIDES="
 	libsndfile$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:sndfile_cmp
-	cmd:sndfile_concat
-	cmd:sndfile_convert
-	cmd:sndfile_deinterleave
-	cmd:sndfile_info
-	cmd:sndfile_interleave
-	cmd:sndfile_metadata_get
-	cmd:sndfile_metadata_set
-	cmd:sndfile_play
-	cmd:sndfile_regtest
-	cmd:sndfile_salvage
+	cmd:sndfile_cmp$secondaryArchSuffix
+	cmd:sndfile_concat$secondaryArchSuffix
+	cmd:sndfile_convert$secondaryArchSuffix
+	cmd:sndfile_deinterleave$secondaryArchSuffix
+	cmd:sndfile_info$secondaryArchSuffix
+	cmd:sndfile_interleave$secondaryArchSuffix
+	cmd:sndfile_metadata_get$secondaryArchSuffix
+	cmd:sndfile_metadata_set$secondaryArchSuffix
+	cmd:sndfile_play$secondaryArchSuffix
+	cmd:sndfile_regtest$secondaryArchSuffix
+	cmd:sndfile_salvage$secondaryArchSuffix
 	lib:libsndfile$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES="