From owner-dev-commits-ports-all@freebsd.org Tue Apr 20 06:59:37 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9B47D5E7457; Tue, 20 Apr 2021 06:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FPZLK1wR5z3rxw; Tue, 20 Apr 2021 06:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1656D630F; Tue, 20 Apr 2021 06:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13K6xaRc026736; Tue, 20 Apr 2021 06:59:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13K6xaCU026735; Tue, 20 Apr 2021 06:59:36 GMT (envelope-from git) Date: Tue, 20 Apr 2021 06:59:36 GMT Message-Id: <202104200659.13K6xaCU026735@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: ff2796d5bc83 - main - Mk/Uses/meson.mk: Do not force color output (D29353) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff2796d5bc837b0c6cb26791439c64f96fe1c090 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 06:59:37 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=ff2796d5bc837b0c6cb26791439c64f96fe1c090 commit ff2796d5bc837b0c6cb26791439c64f96fe1c090 Author: Tobias Kortkamp AuthorDate: 2021-04-08 09:33:03 +0000 Commit: Tobias Kortkamp CommitDate: 2021-04-20 06:57:35 +0000 Mk/Uses/meson.mk: Do not force color output (D29353) By default Meson forces color output. Ninja strips the escape sequences before they go into the log. Samurai does not do that, so we end up with some garbage in the logs. Pass -Db_colorout=never to Meson to disable colors in general. Also see https://mesonbuild.com/Builtin-options.html This requires a small backport in devel/meson since the b_colorout option is broken with Clang at the moment. PR: 254678 Exp-run by: antoine --- Mk/Uses/meson.mk | 5 +++++ devel/meson/Makefile | 1 + .../patch-mesonbuild_compilers_mixins_clang.py | 24 ++++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/Mk/Uses/meson.mk b/Mk/Uses/meson.mk index 0322cb1ed47d..c089b76a0640 100644 --- a/Mk/Uses/meson.mk +++ b/Mk/Uses/meson.mk @@ -36,6 +36,11 @@ CONFIGURE_ARGS+= --prefix ${PREFIX} \ --mandir man \ --infodir ${INFO_PATH} +# Disable color output. Meson forces it on by default, Ninja +# strips it before it goes to the log, but Samurai does not, so we +# might end up with ANSI escape sequences in the logs. +CONFIGURE_ARGS+= -Db_colorout=never + # meson has it own strip mechanic INSTALL_TARGET= install diff --git a/devel/meson/Makefile b/devel/meson/Makefile index 8a25e36d64ba..34f0488e3416 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -2,6 +2,7 @@ PORTNAME= meson PORTVERSION= 0.57.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/ diff --git a/devel/meson/files/patch-mesonbuild_compilers_mixins_clang.py b/devel/meson/files/patch-mesonbuild_compilers_mixins_clang.py new file mode 100644 index 000000000000..d745bd8739b5 --- /dev/null +++ b/devel/meson/files/patch-mesonbuild_compilers_mixins_clang.py @@ -0,0 +1,24 @@ +From c24a0f852489124fa002bdc90b5753547899b1cb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Krzysztof=20Ma=C5=82ysa?= +Date: Tue, 16 Feb 2021 18:46:06 +0100 +Subject: [PATCH] compilers: clang: Drop -Xclang before -fcolor-diagnostics + flag + +Using -Xclang -fcolor-diagnostics provides no advantage to using just -fcolor-diagnostics option and sometimes causes problems: +* uncolored diagnostics on Arch Linux: https://bugs.archlinux.org/task/69662 +* simple problem with removing flag -fcolor-diagnostics: https://github.com/clangd/clangd/issues/279 +--- mesonbuild/compilers/mixins/clang.py.orig 2021-02-20 13:17:16 UTC ++++ mesonbuild/compilers/mixins/clang.py +@@ -29,9 +29,9 @@ if T.TYPE_CHECKING: + from ...dependencies import Dependency # noqa: F401 + + clang_color_args = { +- 'auto': ['-Xclang', '-fcolor-diagnostics'], +- 'always': ['-Xclang', '-fcolor-diagnostics'], +- 'never': ['-Xclang', '-fno-color-diagnostics'], ++ 'auto': ['-fcolor-diagnostics'], ++ 'always': ['-fcolor-diagnostics'], ++ 'never': ['-fno-color-diagnostics'], + } # type: T.Dict[str, T.List[str]] + + clang_optimization_args = {