diff options
| author |   Sergey Torokhov <torokhov-s-a@yandex.ru> | 2021-02-13 15:52:14 +0300 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2021-02-16 18:39:29 +0000 |
| commit | e48d47568a6d300dce1d2980a0f221c53b1295a4 (patch) | |
| tree | c0c7abcfd4a56dcc370fdb1263b970cd50a8ec72 /sci-libs/cantera/files | |
| parent | app-text/dblatex: Bump to 0.3.12 (diff) | |
| download | gentoo-e48d47568a6d300dce1d2980a0f221c53b1295a4.tar.gz gentoo-e48d47568a6d300dce1d2980a0f221c53b1295a4.tar.bz2 gentoo-e48d47568a6d300dce1d2980a0f221c53b1295a4.zip | |
sci-libs/cantera: 2.5.0 version bump
Cantera now use yaml as input format and thus depends on
'dev-cpp/yaml-cpp' and 'dev-python/ruamel-yaml'.
The following dependences in DEPEND are actually not required to build
and if absence the appropriate 2 tests just will be skipped:
test? (
python? (
$(python_gen_cond_dep '
dev-python/h5py[${PYTHON_MULTI_USEDEP}]
dev-python/pandas[${PYTHON_MULTI_USEDEP}]
')
)
Signed-off-by: Sergey Torokhov <torokhov-s-a@yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/19448
Signed-off-by: Sam James <sam@gentoo.org>
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, |