diff -Naur old/SConstruct new/SConstruct --- old/SConstruct 2021-02-13 01:18:43.000000000 +0300 +++ new/SConstruct 2021-02-13 01:27:06.000000000 +0300 @@ -193,7 +193,7 @@ toolchain = ['default'] env = Environment(tools=toolchain+['textfile', 'subst', 'recursiveInstall', 'wix', 'gch'], - ENV={'PATH': os.environ['PATH']}, + ENV={'PATH': os.environ['PATH'], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')}, toolchain=toolchain, **extraEnvArgs) @@ -724,10 +724,7 @@ env['cantera_pure_version'] = re.match(r'(\d+\.\d+\.\d+)', env['cantera_version']).group(0) env['cantera_short_version'] = re.match(r'(\d+\.\d+)', env['cantera_version']).group(0) -try: - env['git_commit'] = getCommandOutput('git', 'rev-parse', '--short', 'HEAD') -except Exception: - env['git_commit'] = 'unknown' +env['git_commit'] = 'unknown' # Print values of all build options: print("Configuration variables read from 'cantera.conf' and command line:") diff -Naur old/interfaces/cython/SConscript new/interfaces/cython/SConscript --- old/interfaces/cython/SConscript 2021-02-13 01:18:43.000000000 +0300 +++ new/interfaces/cython/SConscript 2021-02-13 01:59:29.000000000 +0300 @@ -108,8 +108,7 @@ elif localenv['libdirname'] != 'lib': # 64-bit RHEL / Fedora etc. or e.g. x32 Gentoo profile extra = localenv.subst( - ' --prefix=${{python_prefix}}' - ' --install-lib=${{python_prefix}}/${{libdirname}}/python{}/site-packages'.format(py_version)) + ' --prefix=${stage_dir}${prefix} --install-lib=${python_prefix}') else: extra = '--user' localenv.AppendENVPath( diff -Naur old/test_problems/SConscript new/test_problems/SConscript --- old/test_problems/SConscript 2021-02-13 01:18:43.000000000 +0300 +++ new/test_problems/SConscript 2021-02-13 01:42:19.000000000 +0300 @@ -222,7 +222,7 @@ CompileAndTest('VPsilane_test') CompileAndTest('clib', 'clib_test', 'clib_test', - extensions=['^clib_test.c'], libs=['cantera_shared']) + extensions=['^clib_test.c']) # C++ Samples Test('cxx-bvp', 'cxx_samples', '#build/samples/cxx/bvp/blasius', None,