| 1 |
commit: d7620aa06cd8ca88c9f82a0212e637b4efba46e4 |
| 2 |
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Wed Jul 17 15:46:08 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 19 16:44:57 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7620aa0 |
| 7 |
|
| 8 |
sci-libs/cantera: 2.4.0-r1. Update/merge cantera_* patches |
| 9 |
|
| 10 |
Update "libdirname" patch with upstream [1] and merge it with "env" patch. |
| 11 |
|
| 12 |
[1] https://github.com/Cantera/cantera/pull/661 |
| 13 |
|
| 14 |
Signed-off-by: Sergey Torokhov <torokhov_s_a <AT> mail.ru> |
| 15 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 16 |
|
| 17 |
sci-libs/cantera/cantera-2.4.0-r1.ebuild | 1 - |
| 18 |
sci-libs/cantera/files/cantera_2.4.0_env.patch | 37 ++++++++++++++++++++++---- |
| 19 |
2 files changed, 32 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sci-libs/cantera/cantera-2.4.0-r1.ebuild b/sci-libs/cantera/cantera-2.4.0-r1.ebuild |
| 22 |
index cd7dafba1b5..99d4566ae1e 100644 |
| 23 |
--- a/sci-libs/cantera/cantera-2.4.0-r1.ebuild |
| 24 |
+++ b/sci-libs/cantera/cantera-2.4.0-r1.ebuild |
| 25 |
@@ -46,7 +46,6 @@ DEPEND=" |
| 26 |
" |
| 27 |
|
| 28 |
PATCHES=( |
| 29 |
- "${FILESDIR}/${PN}_${PV}_libdirname_variable.patch" |
| 30 |
"${FILESDIR}/${PN}_${PV}_env.patch" |
| 31 |
) |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/sci-libs/cantera/files/cantera_2.4.0_env.patch b/sci-libs/cantera/files/cantera_2.4.0_env.patch |
| 35 |
index bc018a53f89..8b0926f7b91 100644 |
| 36 |
--- a/sci-libs/cantera/files/cantera_2.4.0_env.patch |
| 37 |
+++ b/sci-libs/cantera/files/cantera_2.4.0_env.patch |
| 38 |
@@ -1,6 +1,6 @@ |
| 39 |
diff -Nur old/cantera-2.4.0/SConstruct new/cantera-2.4.0/SConstruct |
| 40 |
--- old/SConstruct 2018-08-24 16:24:45.000000000 +0300 |
| 41 |
-+++ new/SConstruct 2019-06-22 00:18:41.000000000 +0300 |
| 42 |
++++ new/SConstruct 2019-07-17 15:50:06.000000000 +0300 |
| 43 |
@@ -189,7 +189,7 @@ |
| 44 |
toolchain = ['default'] |
| 45 |
|
| 46 |
@@ -10,7 +10,22 @@ diff -Nur old/cantera-2.4.0/SConstruct new/cantera-2.4.0/SConstruct |
| 47 |
toolchain=toolchain, |
| 48 |
**extraEnvArgs) |
| 49 |
|
| 50 |
-@@ -727,11 +727,8 @@ |
| 51 |
+@@ -327,6 +327,14 @@ |
| 52 |
+ 'prefix', |
| 53 |
+ 'Set this to the directory where Cantera should be installed.', |
| 54 |
+ defaults.prefix, PathVariable.PathAccept), |
| 55 |
++ PathVariable( |
| 56 |
++ 'libdirname', |
| 57 |
++ """Set this to the directory where Cantera libraries should be installed. |
| 58 |
++ Some distributions (e.g. Fedora/RHEL) use 'lib64' instead of 'lib' on 64-bit systems |
| 59 |
++ or could use some other library directory name instead of 'lib' depends |
| 60 |
++ on architecture and profile (e.g. Gentoo 'libx32' on x32 profile). |
| 61 |
++ If user didn't set 'libdirname' configuration variable set it to default value 'lib'""", |
| 62 |
++ 'lib', PathVariable.PathAccept), |
| 63 |
+ EnumVariable( |
| 64 |
+ 'python_package', |
| 65 |
+ """If you plan to work in Python, then you need the ``full`` Cantera Python |
| 66 |
+@@ -723,10 +731,7 @@ |
| 67 |
env['cantera_pure_version'] = '.'.join(str(x) for x in ctversion.version) |
| 68 |
env['cantera_short_version'] = '.'.join(str(x) for x in ctversion.version[:2]) |
| 69 |
|
| 70 |
@@ -22,8 +37,7 @@ diff -Nur old/cantera-2.4.0/SConstruct new/cantera-2.4.0/SConstruct |
| 71 |
|
| 72 |
# Print values of all build options: |
| 73 |
print("Configuration variables read from 'cantera.conf' and command line:") |
| 74 |
- for line in open('cantera.conf'): |
| 75 |
-@@ -1062,7 +1062,7 @@ |
| 76 |
+@@ -1061,7 +1066,7 @@ |
| 77 |
|
| 78 |
# Ignore the minor version, e.g. 2.4.x -> 2.4 |
| 79 |
env['sundials_version'] = '.'.join(sundials_version.split('.')[:2]) |
| 80 |
@@ -32,9 +46,22 @@ diff -Nur old/cantera-2.4.0/SConstruct new/cantera-2.4.0/SConstruct |
| 81 |
print("""ERROR: Sundials version %r is not supported.""" % env['sundials_version']) |
| 82 |
sys.exit(1) |
| 83 |
print("""INFO: Using system installation of Sundials version %s.""" % sundials_version) |
| 84 |
+@@ -1465,12 +1470,6 @@ |
| 85 |
+ # *** Set additional configuration variables *** |
| 86 |
+ # ********************************************** |
| 87 |
+ |
| 88 |
+-# Some distributions (e.g. Fedora/RHEL) use 'lib64' instead of 'lib' on 64-bit systems |
| 89 |
+-if any(name.startswith('/usr/lib64/python') for name in sys.path): |
| 90 |
+- env['libdirname'] = 'lib64' |
| 91 |
+-else: |
| 92 |
+- env['libdirname'] = 'lib' |
| 93 |
+- |
| 94 |
+ # On Debian-based systems, need to special-case installation to |
| 95 |
+ # /usr/local because of dist-packages vs site-packages |
| 96 |
+ env['debian'] = any(name.endswith('dist-packages') for name in sys.path) |
| 97 |
diff -Nur old/cantera-2.4.0/test_problems/SConscript new/cantera-2.4.0/test_problems/SConscript |
| 98 |
--- old/test_problems/SConscript 2018-08-24 16:24:45.000000000 +0300 |
| 99 |
-+++ new/test_problems/SConscript 2019-06-22 00:13:29.000000000 +0300 |
| 100 |
++++ new/test_problems/SConscript 2019-07-17 15:41:35.000000000 +0300 |
| 101 |
@@ -282,7 +282,7 @@ |
| 102 |
CompileAndTest('VPsilane_test', 'VPsilane_test', 'VPsilane_test', 'output_blessed.txt') |
Archives