| 1 |
commit: 5b37420a57390e4fbc7abf0ea78570f0b4204da5 |
| 2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Mon Jun 6 22:19:56 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 7 07:44:04 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b37420a |
| 7 |
|
| 8 |
sci-libs/cantera: restrict sci-libs/sundials for sci-libs/cantera[lapack] |
| 9 |
|
| 10 |
It seems that >=sci-libs/cantera-2.5.1-r3[lapack] tests are |
| 11 |
currently broken if build against >=sci-libs/sundials-5.8.0[lapack]. |
| 12 |
|
| 13 |
The cantera-2.5.1_env.patch is updated here to proper check |
| 14 |
if >=sundials-5.5 is build with lapack support. |
| 15 |
|
| 16 |
This change doesn't affect cantera-2.5.1-r1 at all |
| 17 |
and allow to build cantera-2.5.1-r3 against sundials[lapack] |
| 18 |
but in cantera-2.5.1-r4 restriction of sundials is used. |
| 19 |
|
| 20 |
So revbump is assumed to keep stablized. |
| 21 |
|
| 22 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
| 23 |
Closes: https://github.com/gentoo/gentoo/pull/25779 |
| 24 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 25 |
|
| 26 |
sci-libs/cantera/cantera-2.5.1-r1.ebuild | 2 +- |
| 27 |
...era-2.5.1-r3.ebuild => cantera-2.5.1-r4.ebuild} | 3 ++- |
| 28 |
...antera-2.6.0.ebuild => cantera-2.6.0-r1.ebuild} | 3 ++- |
| 29 |
sci-libs/cantera/files/cantera-2.5.1_env.patch | 27 ++++++++++++++++++++++ |
| 30 |
4 files changed, 32 insertions(+), 3 deletions(-) |
| 31 |
|
| 32 |
diff --git a/sci-libs/cantera/cantera-2.5.1-r1.ebuild b/sci-libs/cantera/cantera-2.5.1-r1.ebuild |
| 33 |
index 659722a8c3cf..5deadec53ca2 100644 |
| 34 |
--- a/sci-libs/cantera/cantera-2.5.1-r1.ebuild |
| 35 |
+++ b/sci-libs/cantera/cantera-2.5.1-r1.ebuild |
| 36 |
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8,9} ) |
| 37 |
FORTRAN_NEEDED=fortran |
| 38 |
FORTRAN_STANDARD="77 90" |
| 39 |
|
| 40 |
-inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs |
| 41 |
+inherit fortran-2 python-single-r1 scons-utils toolchain-funcs |
| 42 |
|
| 43 |
DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport" |
| 44 |
HOMEPAGE="https://www.cantera.org" |
| 45 |
|
| 46 |
diff --git a/sci-libs/cantera/cantera-2.5.1-r3.ebuild b/sci-libs/cantera/cantera-2.5.1-r4.ebuild |
| 47 |
similarity index 97% |
| 48 |
rename from sci-libs/cantera/cantera-2.5.1-r3.ebuild |
| 49 |
rename to sci-libs/cantera/cantera-2.5.1-r4.ebuild |
| 50 |
index dad4dddb283b..cd12713f6574 100644 |
| 51 |
--- a/sci-libs/cantera/cantera-2.5.1-r3.ebuild |
| 52 |
+++ b/sci-libs/cantera/cantera-2.5.1-r4.ebuild |
| 53 |
@@ -39,7 +39,8 @@ RDEPEND=" |
| 54 |
') |
| 55 |
) |
| 56 |
dev-cpp/yaml-cpp |
| 57 |
- <sci-libs/sundials-5.9.0:0=[lapack?] |
| 58 |
+ !lapack? ( <sci-libs/sundials-5.9.0:0= ) |
| 59 |
+ lapack? ( <sci-libs/sundials-5.3.0:0=[lapack] ) |
| 60 |
" |
| 61 |
|
| 62 |
DEPEND=" |
| 63 |
|
| 64 |
diff --git a/sci-libs/cantera/cantera-2.6.0.ebuild b/sci-libs/cantera/cantera-2.6.0-r1.ebuild |
| 65 |
similarity index 97% |
| 66 |
rename from sci-libs/cantera/cantera-2.6.0.ebuild |
| 67 |
rename to sci-libs/cantera/cantera-2.6.0-r1.ebuild |
| 68 |
index 35884d896367..fb800fb485b5 100644 |
| 69 |
--- a/sci-libs/cantera/cantera-2.6.0.ebuild |
| 70 |
+++ b/sci-libs/cantera/cantera-2.6.0-r1.ebuild |
| 71 |
@@ -39,7 +39,8 @@ RDEPEND=" |
| 72 |
') |
| 73 |
) |
| 74 |
dev-cpp/yaml-cpp |
| 75 |
- <sci-libs/sundials-5.9.0:0=[lapack?] |
| 76 |
+ !lapack? ( sci-libs/sundials:0= ) |
| 77 |
+ lapack? ( <sci-libs/sundials-5.3.0:0=[lapack?] ) |
| 78 |
" |
| 79 |
|
| 80 |
DEPEND=" |
| 81 |
|
| 82 |
diff --git a/sci-libs/cantera/files/cantera-2.5.1_env.patch b/sci-libs/cantera/files/cantera-2.5.1_env.patch |
| 83 |
index 576e2de2d577..77004803b127 100644 |
| 84 |
--- a/sci-libs/cantera/files/cantera-2.5.1_env.patch |
| 85 |
+++ b/sci-libs/cantera/files/cantera-2.5.1_env.patch |
| 86 |
@@ -32,6 +32,33 @@ diff -Naur old/SConstruct new/SConstruct |
| 87 |
|
| 88 |
# Print values of all build options: |
| 89 |
print("Configuration variables read from 'cantera.conf' and command line:") |
| 90 |
+@@ -1149,10 +1149,24 @@ |
| 91 |
+ if retcode == 0: |
| 92 |
+ config_error("Failed to determine Sundials BLAS/LAPACK.") |
| 93 |
+ env['has_sundials_lapack'] = int(has_sundials_lapack.strip()) |
| 94 |
+- else: |
| 95 |
+- # In Sundials 2.6, SUNDIALS_BLAS_LAPACK is either defined or undefined |
| 96 |
++ elif sundials_ver < parse_version('5.5'): |
| 97 |
++ # In Sundials 2.6-5.5, SUNDIALS_BLAS_LAPACK is either defined or undefined |
| 98 |
+ env['has_sundials_lapack'] = conf.CheckDeclaration('SUNDIALS_BLAS_LAPACK', |
| 99 |
+ '#include "sundials/sundials_config.h"', 'C++') |
| 100 |
++ else: |
| 101 |
++ # In Sundials 5.5 and higher, two defines are included specific to the |
| 102 |
++ # SUNLINSOL packages indicating whether SUNDIALS has been built with LAPACK |
| 103 |
++ lapackband = conf.CheckDeclaration( |
| 104 |
++ "SUNDIALS_SUNLINSOL_LAPACKBAND", |
| 105 |
++ '#include "sundials/sundials_config.h"', |
| 106 |
++ "C++", |
| 107 |
++ ) |
| 108 |
++ lapackdense = conf.CheckDeclaration( |
| 109 |
++ "SUNDIALS_SUNLINSOL_LAPACKDENSE", |
| 110 |
++ '#include "sundials/sundials_config.h"', |
| 111 |
++ "C++", |
| 112 |
++ ) |
| 113 |
++ env["has_sundials_lapack"] = lapackband and lapackdense |
| 114 |
+ |
| 115 |
+ # In the case where a user is trying to link Cantera to an external BLAS/LAPACK |
| 116 |
+ # library, but Sundials was configured without this support, print a Warning. |
| 117 |
diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript |
| 118 |
--- old/interfaces/cython/SConscript 2021-03-21 01:18:43.000000000 +0300 |
| 119 |
+++ new/interfaces/cython/SConscript 2021-03-21 01:59:29.000000000 +0300 |
Archives