internal/rosa/package/meson: respect CLICOLOR_FORCE
Test / Create distribution (push) Successful in 52s
Test / Sandbox (push) Successful in 3m1s
Test / Hakurei (push) Successful in 4m37s
Test / Sandbox (race detector) (push) Successful in 6m0s
Test / Hakurei (race detector) (push) Successful in 7m11s
Test / ShareFS (push) Successful in 7m38s
Test / Flake checks (push) Successful in 1m12s
Test / Create distribution (push) Successful in 52s
Test / Sandbox (push) Successful in 3m1s
Test / Hakurei (push) Successful in 4m37s
Test / Sandbox (race detector) (push) Successful in 6m0s
Test / Hakurei (race detector) (push) Successful in 7m11s
Test / ShareFS (push) Successful in 7m38s
Test / Flake checks (push) Successful in 1m12s
Upstream had ticket and patch available since 2017, still unmerged and refuses to support the environment variable, so patch it in. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -9,6 +9,7 @@ package meson {
|
|||||||
tag = version;
|
tag = version;
|
||||||
checksum = "9AMilGxTOVqPA2DaGMASyuVs1BeTzgDZ0NH2oSYoRZk846ApvfOBa4cc18XEEK7M";
|
checksum = "9AMilGxTOVqPA2DaGMASyuVs1BeTzgDZ0NH2oSYoRZk846ApvfOBa4cc18XEEK7M";
|
||||||
};
|
};
|
||||||
|
patches = [ "respect-colour.patch" ];
|
||||||
|
|
||||||
env = [
|
env = [
|
||||||
"CMAKE_MAKE_PROGRAM=ninja",
|
"CMAKE_MAKE_PROGRAM=ninja",
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/mesonbuild/mlog.py b/mesonbuild/mlog.py
|
||||||
|
index e1d998a5d..83d6cf9d2 100644
|
||||||
|
--- a/mesonbuild/mlog.py
|
||||||
|
+++ b/mesonbuild/mlog.py
|
||||||
|
@@ -404,6 +404,8 @@ class _Logger:
|
||||||
|
_colorize_console = os.isatty(output.fileno()) and _windows_ansi()
|
||||||
|
else:
|
||||||
|
_colorize_console = os.isatty(output.fileno()) and os.environ.get('TERM', 'dumb') != 'dumb'
|
||||||
|
+ if os.environ.get('CLICOLOR_FORCE', '') != '':
|
||||||
|
+ _colorize_console = True
|
||||||
|
except Exception:
|
||||||
|
_colorize_console = False
|
||||||
|
output.colorize_console = _colorize_console # type: ignore
|
||||||
Reference in New Issue
Block a user