From 1899208464e5b7989e0d1b7a0702ed40464532fa Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Thu, 8 Aug 2013 04:46:25 +0200
Subject: [PATCH] libsolv: support building for secondary architecture

---
 .../libsolv-0.3.0_haiku_2013_06_16.recipe     | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe
index 86ca41a69..78dc70612 100644
--- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe
+++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe
@@ -4,40 +4,46 @@ LICENSE="BSD (3-clause)"
 COPYRIGHT="2007-2013, Novell Inc."
 HOMEPAGE="http://github.com/openSUSE/libsolv" 
 SRC_URI="git+git://github.com/weinhold/libsolv.git#ef4a8778ef567224feb35019b711507ae1d6e7c3"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	libsolv = $portVersion
-	lib:libsolv = $portVersion
-	lib:libsolvext = $portVersion
+	libsolv$secondaryArchSuffix = $portVersion
+	lib:libsolv$secondaryArchSuffix = $portVersion
+	lib:libsolvext$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libexpat
-	lib:libz
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libexpat$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libexpat
-	devel:libz
+	devel:libexpat$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:cmake
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	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, \
+		src/CMakeLists.txt ext/CMakeLists.txt
+}
 
 BUILD()
 {
 	rm -rf build
 	mkdir build
 	cd build
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix ..
+	cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix -DLIB=$relativeLibDir ..
 	make $jobArgs
 }
 
@@ -49,10 +55,6 @@ INSTALL()
 	# set up the develop directory correctly
 	prepareInstalledDevelLibs libsolv libsolvext
 
-	mkdir -p $includeDir
-	mv $prefix/include/* $includeDir
-	rmdir $prefix/include
-
 	# move cmake files
 	mkdir -p $dataDir
 	mv $prefix/share/cmake $dataDir
@@ -69,12 +71,11 @@ INSTALL()
 
 # ----- devel package -------------------------------------------------------
 
-SUMMARY_devel="The libsolv development files"
 PROVIDES_devel="
-	libsolv_devel = $portVersion
-	devel:libsolv = $portVersion
-	devel:libsolvext = $portVersion
+	libsolv${secondaryArchSuffix}_devel = $portVersion
+	devel:libsolv${secondaryArchSuffix} = $portVersion
+	devel:libsolvext${secondaryArchSuffix} = $portVersion
 	"
 REQUIRES_devel="
-	libsolv == $portVersion base
+	libsolv${secondaryArchSuffix} == $portVersion base
 	"