From 54d1cf8641a3ea0bce857046692b8b53aa9f38d1 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Dec 2013 02:37:13 -0800 Subject: [PATCH] Fixed lcms on x86 --- media-libs/lcms/lcms-2.5.recipe | 45 ++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/media-libs/lcms/lcms-2.5.recipe b/media-libs/lcms/lcms-2.5.recipe index f8874d21a..6bde06ecd 100644 --- a/media-libs/lcms/lcms-2.5.recipe +++ b/media-libs/lcms/lcms-2.5.recipe @@ -8,32 +8,35 @@ LICENSE="MIT" COPYRIGHT="2007 Marti Maria" ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - lcms = 2.5 compat >= 2 - lib:liblcms2 - cmd:jpgicc - cmd:linkicc - cmd:psicc - cmd:tificc - cmd:transicc + lcms$secondaryArchSuffix = 2.5 compat >= 2 + lib:liblcms2$secondaryArchSuffix + cmd:jpgicc$secondaryArchSuffix + cmd:linkicc$secondaryArchSuffix + cmd:psicc$secondaryArchSuffix + cmd:tificc$secondaryArchSuffix + cmd:transicc$secondaryArchSuffix " REQUIRES=" - haiku - lib:libjpeg - lib:libpng - lib:libtiff - lib:libz" + haiku >= $haikuVersion + lib:libjpeg$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " BUILD_REQUIRES=" - devel:libjpeg - devel:libpng - devel:libtiff - devel:libz" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " BUILD_PREREQUIRES=" - haiku_devel cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:libtoolize @@ -71,10 +74,10 @@ INSTALL() # ----- devel package --------------------------------------- PROVIDES_devel=" - lcms_devel = $portVersion - devel:lcms = 2.5 compat >= 2 - devel:liblcms2 = 2.0.1 compat >= 2 + lcms${secondaryArchSuffix}_devel = $portVersion + devel:lcms$secondaryArchSuffix = 2.5 compat >= 2 + devel:liblcms2$secondaryArchSuffix = 2.0.1 compat >= 2 " REQUIRES_devel=" - lcms == $portVersion base + lcms$secondaryArchSuffix == $portVersion base "