From 565d1ba6cebbdab596840e585f00e82369b728e1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 10 Mar 2021 18:17:56 +0100 Subject: [PATCH] nuspell: enable build requires hrev54978 or newer --- app-text/nuspell/nuspell-3.0.0.recipe | 31 ++++++++++++++++----------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/app-text/nuspell/nuspell-3.0.0.recipe b/app-text/nuspell/nuspell-3.0.0.recipe index 70305516e..9bd97e814 100644 --- a/app-text/nuspell/nuspell-3.0.0.recipe +++ b/app-text/nuspell/nuspell-3.0.0.recipe @@ -22,25 +22,29 @@ LICENSE="GNU LGPL v3" REVISION="2" SOURCE_URI="https://github.com/nuspell/nuspell/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="9ce86d5463723cc7dceba9d1dd046e1022ed5e3004ac6d12f2daaf5b090a6066" +SOURCE_FILENAME="nuspell-$portVersion.tar.gz" PATCHES="nuspell-$portVersion.patchset" -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86" +ARCHITECTURES="!x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="x86" + +libVersion="$portVersion compat >= 3" PROVIDES=" $portName = $portVersion - cmd:nuspell$secondaryArchSuffix = $portVersion + lib:libnuspell$secondaryArchSuffix = $libVersion + cmd:nuspell = $portVersion " REQUIRES=" haiku$secondaryArchSuffix lib:libboost_locale$secondaryArchSuffix - lib:libicudata$secondaryArchSuffix >= 66 - lib:libicuuc$secondaryArchSuffix >= 66 + lib:libicudata$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix " PROVIDES_devel=" nuspell${secondaryArchSuffix}_devel = $portVersion - devel:libnuspell$secondaryArchSuffix + devel:libnuspell$secondaryArchSuffix = $libVersion " REQUIRES_devel=" nuspell$secondaryArchSuffix == $portVersion base @@ -48,7 +52,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libboost_locale$secondaryArchSuffix + devel:libboost_locale$secondaryArchSuffix >= 1.69.0 devel:libicudata$secondaryArchSuffix >= 66 devel:libicuuc$secondaryArchSuffix >= 66 " @@ -65,7 +69,9 @@ BUILD() { mkdir -p build cd build - cmake $cmakeDirArgs .. + cmake $cmakeDirArgs .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=ON make $jobArgs } @@ -82,7 +88,8 @@ INSTALL() $libDir/cmake } -#TEST() -#{ -# make test -#} +TEST() +{ + cd build + make test +}