From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7D6D9158091 for ; Tue, 7 Jun 2022 07:46:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90E6FE07D4; Tue, 7 Jun 2022 07:46:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 75579E07D4 for ; Tue, 7 Jun 2022 07:46:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 62339341930 for ; Tue, 7 Jun 2022 07:46:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11AEB44B for ; Tue, 7 Jun 2022 07:45:56 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1654587844.b2bd34c5505de901634cfe583f956b7ed85da8a4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/cantera/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/cantera/files/cantera-2.6.0_env.patch X-VCS-Directories: sci-libs/cantera/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b2bd34c5505de901634cfe583f956b7ed85da8a4 X-VCS-Branch: master Date: Tue, 7 Jun 2022 07:45:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2e95de62-f6b6-4224-aef6-741c1aa8b5c5 X-Archives-Hash: d377b03f28227044bd8e4cedbe5932c7 commit: b2bd34c5505de901634cfe583f956b7ed85da8a4 Author: Sergey Torokhov yandex ru> AuthorDate: Mon Jun 6 22:13:21 2022 +0000 Commit: Sam James gentoo 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 yandex.ru> Signed-off-by: Sam James 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