From 14f846e357e21ec73edafe5748d8df642f39d7e6 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Thu, 21 Aug 2025 13:57:10 +0200 Subject: [PATCH] ixion, add 0.20.0, drop obsolete 0.17.0 (#12801) --- ...-0.17.0.recipe => ixion0.20-0.20.0.recipe} | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) rename dev-libs/ixion/{ixion-0.17.0.recipe => ixion0.20-0.20.0.recipe} (79%) diff --git a/dev-libs/ixion/ixion-0.17.0.recipe b/dev-libs/ixion/ixion0.20-0.20.0.recipe similarity index 79% rename from dev-libs/ixion/ixion-0.17.0.recipe rename to dev-libs/ixion/ixion0.20-0.20.0.recipe index baf94e045..4f2cc50bc 100644 --- a/dev-libs/ixion/ixion-0.17.0.recipe +++ b/dev-libs/ixion/ixion0.20-0.20.0.recipe @@ -10,15 +10,15 @@ and a partial calculation of only the affected cells need to be calculated." HOMEPAGE="https://gitlab.com/ixion/ixion" COPYRIGHT="Kohei Yoshida et al." LICENSE="MPL v2.0" -REVISION="4" +REVISION="1" SOURCE_URI="https://gitlab.com/ixion/ixion/-/archive/$portVersion/ixion-$portVersion.tar.bz2" -CHECKSUM_SHA256="63f3942defc684be82046b9d7454602dadafced9be7b3b60e9e8a5fa63ee91a8" +CHECKSUM_SHA256="39e54cd486fed458c2a6e83a5e658d4c2e818862355b33645bb1342449428463" SOURCE_DIR="ixion-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -boostMinimumVersion=1.83.0 +boostMinimumVersion=1.88.0 commandBinDir=$binDir commandSuffix=$secondaryArchSuffix @@ -30,7 +30,7 @@ fi soVersion="${portVersion%.*}" PROVIDES=" - ixion$secondaryArchSuffix = $portVersion + ixion0.20$secondaryArchSuffix = $portVersion lib:libixion_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES=" @@ -42,22 +42,27 @@ REQUIRES=" " PROVIDES_devel=" - ixion${secondaryArchSuffix}_devel = $portVersion + ixion0.20${secondaryArchSuffix}_devel = $portVersion devel:libixion_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES_devel=" - ixion$secondaryArchSuffix == $portVersion base + ixion0.20$secondaryArchSuffix == $portVersion base + devel:libboost_system$secondaryArchSuffix " PROVIDES_tools=" - ixion${secondaryArchSuffix}_tools = $portVersion + ixion0.20${secondaryArchSuffix}_tools = $portVersion cmd:ixion_formula_tokenizer$commandSuffix = $portVersion cmd:ixion_parser$commandSuffix = $portVersion cmd:ixion_sorter$commandSuffix = $portVersion " REQUIRES_tools=" $REQUIRES - ixion$secondaryArchSuffix == $portVersion base + ixion0.20$secondaryArchSuffix == $portVersion base + " +CONFLICTS_tools=" + ixion${secondaryArchSuffix}_tools + ixion0.18${secondaryArchSuffix}_tools " BUILD_REQUIRES=" @@ -67,12 +72,13 @@ BUILD_REQUIRES=" devel:libboost_system$secondaryArchSuffix >= $boostMinimumVersion devel:libz$secondaryArchSuffix devel:libspdlog$secondaryArchSuffix - devel:mdds >= 2 + devel:mdds >= 3.0 " BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf cmd:automake + cmd:doxygen cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix @@ -80,7 +86,7 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage ixion$secondaryArchSuffix \ +defineDebugInfoPackage ixion0.20$secondaryArchSuffix \ "$(getPackagePrefix tools)"/bin/ixion-formula-tokenizer \ "$(getPackagePrefix tools)"/bin/ixion-parser \ "$(getPackagePrefix tools)"/bin/ixion-sorter \ @@ -96,17 +102,26 @@ PATCH() BUILD() { autoreconf -fi + export CXXFLAGS="-std=c++17 -O2 -g" BOOST_ROOT="$portPackageLinksDir"/devel~libboost_program_options/develop runConfigure --omit-dirs binDir ./configure \ --bindir=$commandBinDir \ --enable-python=no make $jobArgs + + cd doc + doxygen doxygen.conf } INSTALL() { make install + # documentation + docdir="$developDir/documentation/ixion${portVersion%.*}" + mkdir -p $docdir + cp -r doc/_doxygen/html $docdir + rm -f "$libDir"/libixion-$soVersion.la prepareInstalledDevelLib libixion-$soVersion