summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Torokhov <torokhov-s-a@yandex.ru>2022-06-07 01:13:21 +0300
committerSam James <sam@gentoo.org>2022-06-07 08:44:04 +0100
commitb2bd34c5505de901634cfe583f956b7ed85da8a4 (patch)
treeb0656afa16f742f67584a546aac4d98348f3a081 /sci-libs/cantera/files/cantera-2.6.0_env.patch
parentdev-util/geany-plugins: Stabilize 1.38-r1 ppc64, #849206 (diff)
downloadgentoo-b2bd34c5505de901634cfe583f956b7ed85da8a4.tar.gz
gentoo-b2bd34c5505de901634cfe583f956b7ed85da8a4.tar.bz2
gentoo-b2bd34c5505de901634cfe583f956b7ed85da8a4.zip
sci-libs/cantera: 2.6.0 fix install for >=dev-python/pip-22.1.1
Closes: https://bugs.gentoo.org/849938 Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-libs/cantera/files/cantera-2.6.0_env.patch')
-rw-r--r--sci-libs/cantera/files/cantera-2.6.0_env.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/sci-libs/cantera/files/cantera-2.6.0_env.patch b/sci-libs/cantera/files/cantera-2.6.0_env.patch
index e49fb4679dd..15a1e65857e 100644
--- a/sci-libs/cantera/files/cantera-2.6.0_env.patch
+++ b/sci-libs/cantera/files/cantera-2.6.0_env.patch
@@ -43,6 +43,27 @@ diff -Naur old/SConstruct new/SConstruct
# Print values of all build options:
# the (updated) "cantera.conf" combines all options that were specified by the user
+diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript
+--- old/interfaces/cython/SConscript
++++ new/interfaces/cython/SConscript
+@@ -107,7 +107,7 @@
+ obj, LIBPREFIX="", SHLIBSUFFIX=module_ext,
+ SHLIBPREFIX="", LIBSUFFIXES=[module_ext])
+
+-build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --use-feature=in-tree-build --no-deps "
++build_cmd = ("$python_cmd_esc -m pip wheel -v --no-build-isolation --no-deps "
+ "--wheel-dir=build/python/dist build/python")
+ plat = info['plat'].replace('-', '_').replace('.', '_')
+ wheel_name = (f"Cantera-{env['cantera_version']}-cp{py_version_nodot}"
+@@ -172,7 +172,7 @@
+
+ install_cmd.append(f"--root={stage_dir.resolve()}")
+
+-install_cmd.extend(("--no-build-isolation", "--use-feature=in-tree-build", "--no-deps", "-v", "--force-reinstall",
++install_cmd.extend(("--no-build-isolation", "--no-deps", "-v", "--force-reinstall",
+ "build/python"))
+ if localenv['PYTHON_INSTALLER'] == 'direct':
+ mod_inst = install(localenv.Command, 'dummy', mod,
diff -Naur old/test_problems/SConscript new/test_problems/SConscript
--- old/test_problems/SConscript
+++ new/test_problems/SConscript