mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-20 18:34:35 +00:00
1f16f351c7Bug: https://bugs.gentoo.org/945800 Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/39910 Signed-off-by: Sam James <sam@gentoo.org>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
diff '--color=auto' -Naur a/SConstruct b/SConstruct
|
|
--- a/SConstruct
|
|
+++ b/SConstruct
|
|
@@ -170,11 +170,7 @@
|
|
|
|
cantera_git_commit = os.environ.get("CT_GIT_COMMIT")
|
|
if not cantera_git_commit:
|
|
- try:
|
|
- cantera_git_commit = get_command_output("git", "rev-parse", "--short", "HEAD")
|
|
- logger.info(f"Building Cantera from git commit {cantera_git_commit!r}")
|
|
- except (subprocess.CalledProcessError, FileNotFoundError):
|
|
- cantera_git_commit = "unknown"
|
|
+ cantera_git_commit = "unknown"
|
|
else:
|
|
logger.info(f"Building Cantera from git commit {cantera_git_commit!r}")
|
|
|
|
@@ -866,7 +862,7 @@
|
|
toolchain = ["default"]
|
|
|
|
env = Environment(tools=toolchain+["textfile", "subst", "recursiveInstall", "UnitsInterfaceBuilder", "wix", "gch"],
|
|
- ENV={"PATH": os.environ["PATH"]},
|
|
+ ENV={'PATH': os.environ['PATH'], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')},
|
|
toolchain=toolchain,
|
|
**extraEnvArgs)
|
|
|
|
diff '--color=auto' -Naur a/src/SConscript b/src/SConscript
|
|
--- a/src/SConscript
|
|
+++ b/src/SConscript
|
|
@@ -90,7 +90,7 @@
|
|
shim = pyenv.SharedObject("extensions/pythonShim.cpp")
|
|
pylibname = f"../lib/cantera_python{pyenv['py_version_short'].replace('.', '_')}"
|
|
lib = build(pyenv.SharedLibrary(pylibname, shim, SPAWN=get_spawn(pyenv)))
|
|
- install("$inst_shlibdir", lib)
|
|
+ install("$inst_shlibdir/cantera", lib)
|
|
|
|
|
|
# build the Cantera static library
|