commit: b2bd34c5505de901634cfe583f956b7ed85da8a4 Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Mon Jun 6 22:13:21 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jun 7 07:44:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2bd34c5
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 <AT> yandex.ru> Signed-off-by: Sam James <sam <AT> gentoo.org> sci-libs/cantera/files/cantera-2.6.0_env.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) 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 e49fb4679dd7..15a1e65857e4 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
