| 1 |
commit: b2bd34c5505de901634cfe583f956b7ed85da8a4 |
| 2 |
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Mon Jun 6 22:13:21 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=b2bd34c5 |
| 7 |
|
| 8 |
sci-libs/cantera: 2.6.0 fix install for >=dev-python/pip-22.1.1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/849938 |
| 11 |
|
| 12 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
sci-libs/cantera/files/cantera-2.6.0_env.patch | 21 +++++++++++++++++++++ |
| 16 |
1 file changed, 21 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sci-libs/cantera/files/cantera-2.6.0_env.patch b/sci-libs/cantera/files/cantera-2.6.0_env.patch |
| 19 |
index e49fb4679dd7..15a1e65857e4 100644 |
| 20 |
--- a/sci-libs/cantera/files/cantera-2.6.0_env.patch |
| 21 |
+++ b/sci-libs/cantera/files/cantera-2.6.0_env.patch |
| 22 |
@@ -43,6 +43,27 @@ diff -Naur old/SConstruct new/SConstruct |
| 23 |
|
| 24 |
# Print values of all build options: |
| 25 |
# the (updated) "cantera.conf" combines all options that were specified by the user |
| 26 |
+diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript |
| 27 |
+--- old/interfaces/cython/SConscript |
| 28 |
++++ new/interfaces/cython/SConscript |
| 29 |
+@@ -107,7 +107,7 @@ |
| 30 |
+ obj, LIBPREFIX="", SHLIBSUFFIX=module_ext, |
| 31 |
+ SHLIBPREFIX="", LIBSUFFIXES=[module_ext]) |
| 32 |
+ |
| 33 |
+-build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --use-feature=in-tree-build --no-deps " |
| 34 |
++build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --no-deps " |
| 35 |
+ "--wheel-dir=build/python/dist build/python") |
| 36 |
+ plat = info['plat'].replace('-', '_').replace('.', '_') |
| 37 |
+ wheel_name = (f"Cantera-{env['cantera_version']}-cp{py_version_nodot}" |
| 38 |
+@@ -172,7 +172,7 @@ |
| 39 |
+ |
| 40 |
+ install_cmd.append(f"--root={stage_dir.resolve()}") |
| 41 |
+ |
| 42 |
+-install_cmd.extend(("--no-build-isolation", "--use-feature=in-tree-build", "--no-deps", "-v", "--force-reinstall", |
| 43 |
++install_cmd.extend(("--no-build-isolation", "--no-deps", "-v", "--force-reinstall", |
| 44 |
+ "build/python")) |
| 45 |
+ if localenv['PYTHON_INSTALLER'] == 'direct': |
| 46 |
+ mod_inst = install(localenv.Command, 'dummy', mod, |
| 47 |
diff -Naur old/test_problems/SConscript new/test_problems/SConscript |
| 48 |
--- old/test_problems/SConscript |
| 49 |
+++ new/test_problems/SConscript |
Archives