diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-17 10:35:54 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-17 10:35:54 +0000 |
| commit | 463397cf1e064185110fe57c568d73f99a06f5d1 (patch) | |
| tree | 9aa75eefc5154eaf0e3c33658b830fc54dc68052 /sci-libs/cantera/files | |
| parent | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff) | |
gentoo resync : 17.02.2021
Diffstat (limited to 'sci-libs/cantera/files')
| -rw-r--r-- | sci-libs/cantera/files/cantera-2.5.0_env.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/sci-libs/cantera/files/cantera-2.5.0_env.patch b/sci-libs/cantera/files/cantera-2.5.0_env.patch new file mode 100644 index 000000000000..9551d4b4ca1c --- /dev/null +++ b/sci-libs/cantera/files/cantera-2.5.0_env.patch @@ -0,0 +1,49 @@ +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, |