| 1 |
commit: fa0bc77060e83768e5e5620fdf6ecbfd6546bd99 |
| 2 |
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru> |
| 3 |
AuthorDate: Wed Jul 17 15:03:27 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 19 16:44:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0bc770 |
| 7 |
|
| 8 |
sci-libs/cantera: 2.4.0-r1. Fix 'fatal' warning |
| 9 |
|
| 10 |
The SConstruct script contains block that tries to evaluate |
| 11 |
'git rev-parse --short HEAD` comand and returns the |
| 12 |
"fatal: not a git repository (or any parent up to mount point /var/tmp)" |
| 13 |
warning from git command itself if git is installed in system. |
| 14 |
It occurs because the release package archive doesn't contain ".git" directory. |
| 15 |
This behaviour doesn't affect emerge process but can confuse |
| 16 |
in the case of other issues. |
| 17 |
|
| 18 |
Closes: https://bugs.gentoo.org/689998 |
| 19 |
Signed-off-by: Sergey Torokhov <torokhov_s_a <AT> mail.ru> |
| 20 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 21 |
|
| 22 |
sci-libs/cantera/files/cantera_2.4.0_env.patch | 15 ++++++++++++++- |
| 23 |
1 file changed, 14 insertions(+), 1 deletion(-) |
| 24 |
|
| 25 |
diff --git a/sci-libs/cantera/files/cantera_2.4.0_env.patch b/sci-libs/cantera/files/cantera_2.4.0_env.patch |
| 26 |
index 1be40dfe044..bc018a53f89 100644 |
| 27 |
--- a/sci-libs/cantera/files/cantera_2.4.0_env.patch |
| 28 |
+++ b/sci-libs/cantera/files/cantera_2.4.0_env.patch |
| 29 |
@@ -10,7 +10,20 @@ diff -Nur old/cantera-2.4.0/SConstruct new/cantera-2.4.0/SConstruct |
| 30 |
toolchain=toolchain, |
| 31 |
**extraEnvArgs) |
| 32 |
|
| 33 |
-@@ -1061,7 +1061,7 @@ |
| 34 |
+@@ -727,11 +727,8 @@ |
| 35 |
+ env['cantera_pure_version'] = '.'.join(str(x) for x in ctversion.version) |
| 36 |
+ env['cantera_short_version'] = '.'.join(str(x) for x in ctversion.version[:2]) |
| 37 |
+ |
| 38 |
+-try: |
| 39 |
+- env['git_commit'] = getCommandOutput('git', 'rev-parse', '--short', 'HEAD') |
| 40 |
+-except Exception: |
| 41 |
+- env['git_commit'] = 'unknown' |
| 42 |
++env['git_commit'] = 'unknown' |
| 43 |
+ |
| 44 |
+ # Print values of all build options: |
| 45 |
+ print("Configuration variables read from 'cantera.conf' and command line:") |
| 46 |
+ for line in open('cantera.conf'): |
| 47 |
+@@ -1062,7 +1062,7 @@ |
| 48 |
|
| 49 |
# Ignore the minor version, e.g. 2.4.x -> 2.4 |
| 50 |
env['sundials_version'] = '.'.join(sundials_version.split('.')[:2]) |
Archives