ixion, bump boost requirement to 1.90.0 (#13872)

This commit is contained in:
Schrijvers Luc
2026-03-28 09:10:19 +01:00
committed by GitHub
parent 65158241b3
commit 74a9a09d50
2 changed files with 49 additions and 7 deletions

View File

@@ -10,15 +10,16 @@ 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="1"
REVISION="2"
SOURCE_URI="https://gitlab.com/ixion/ixion/-/archive/$portVersion/ixion-$portVersion.tar.bz2"
CHECKSUM_SHA256="39e54cd486fed458c2a6e83a5e658d4c2e818862355b33645bb1342449428463"
SOURCE_DIR="ixion-$portVersion"
PATCHES="boost190.patch"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
boostMinimumVersion=1.88.0
boostMinimumVersion=1.90.0
commandBinDir=$binDir
commandSuffix=$secondaryArchSuffix
@@ -37,7 +38,6 @@ REQUIRES="
haiku$secondaryArchSuffix
lib:libboost_filesystem$secondaryArchSuffix
lib:libboost_program_options$secondaryArchSuffix
lib:libboost_system$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -47,7 +47,7 @@ PROVIDES_devel="
"
REQUIRES_devel="
ixion0.20$secondaryArchSuffix == $portVersion base
devel:libboost_system$secondaryArchSuffix
devel:libboost_filesystem$secondaryArchSuffix
"
PROVIDES_tools="
@@ -65,11 +65,15 @@ CONFLICTS_tools="
ixion0.18${secondaryArchSuffix}_tools
"
ARCHITECTURES_doc="any"
PROVIDES_doc="
ixion0.20_doc
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libboost_filesystem$secondaryArchSuffix >= $boostMinimumVersion
devel:libboost_program_options$secondaryArchSuffix >= $boostMinimumVersion
devel:libboost_system$secondaryArchSuffix >= $boostMinimumVersion
devel:libz$secondaryArchSuffix
devel:libspdlog$secondaryArchSuffix
devel:mdds >= 3.0
@@ -118,9 +122,9 @@ INSTALL()
make install
# documentation
docdir="$developDir/documentation/ixion${portVersion%.*}"
docdir="$documentationDir/packages/orcus${portVersion%.*}"
mkdir -p $docdir
cp -r doc/_doxygen/html $docdir
cp -r doc/_doxygen/html/* $docdir
rm -f "$libDir"/libixion-$soVersion.la
@@ -132,6 +136,9 @@ INSTALL()
packageEntries tools \
"$commandBinDir"
packageEntries doc \
$documentationDir
}
TEST()

View File

@@ -0,0 +1,35 @@
From bfe5ab6adadda265d575fec9c192e6f53f2ef9f5 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Fri, 4 Apr 2025 21:08:55 -0400
Subject: [PATCH] Update boost.m4 from the latest upstream
---
m4/boost.m4 | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/m4/boost.m4 b/m4/boost.m4
index 706035d3..342516e4 100644
--- a/m4/boost.m4
+++ b/m4/boost.m4
@@ -1332,11 +1332,16 @@ BOOST_DEFUN([String_Algo],
# --------------------------------
# Look for Boost.System. For the documentation of PREFERRED-RT-OPT, see the
# documentation of BOOST_FIND_LIB above. This library was introduced in Boost
-# 1.35.0.
+# 1.35.0 and is header only since 1.70.
BOOST_DEFUN([System],
-[BOOST_FIND_LIB([system], [$1],
+[
+if test $boost_major_version -ge 170; then
+ BOOST_FIND_HEADER([boost/system/error_code.hpp])
+else
+ BOOST_FIND_LIB([system], [$1],
[boost/system/error_code.hpp],
[boost::system::error_code e; e.clear();], [], [], [$2])
+fi
])# BOOST_SYSTEM
--
GitLab