From f38cb58805e43dcd43ce5edf683268bfb9595fb4 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 26 Dec 2013 14:34:10 -0800 Subject: [PATCH] Update libcoverart for secondaryArchSuffix support, but still fails to build due to directory issue. --- .../libcoverart/libcoverart-1.0.0.recipe | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/media-libs/libcoverart/libcoverart-1.0.0.recipe b/media-libs/libcoverart/libcoverart-1.0.0.recipe index 2abcb919e..dd701d87a 100644 --- a/media-libs/libcoverart/libcoverart-1.0.0.recipe +++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe @@ -7,41 +7,49 @@ LICENSE="GNU LGPL v2" COPYRIGHT="2012 Andrew Hawkins" REVISION="1" -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86 ?x86_64" PROVIDES=" - lib:libcoverart + libcoverart = $portVersion + lib:libcoverart$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku - lib:libjansson - lib:libneon + haiku$secondaryArchSuffix >= $haikuVersion + lib:libjansson$secondaryArchSuffix + lib:libneon$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libjansson - devel:libneon + devel:libjansson$secondaryArchSuffix + devel:libneon$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:cmake - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " SOURCE_DIR="libcoverart-{PROJECT_VERSION}" BUILD() { - cmake . + cmake . make } INSTALL() { make install + prepareInstalledDevelLibs libcoverart + fixPkgconfig + + packageEntries devel \ + $developDir } TEST() @@ -50,3 +58,12 @@ TEST() cd tests ./test } + +PROVIDES_devel=" + libcoverart${secondaryArchSuffix}_devel = $portVersion + devel:libcoverart$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + libcoverart$secondaryArchSuffix == $portVersion base + "