From nobody Tue Nov 14 16:52:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SVC4y0hfnz51Vrt; Tue, 14 Nov 2023 16:52:02 +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 4SVC4y047vz4KgD; Tue, 14 Nov 2023 16:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699980722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5K1Wqk/Htn1ldVWY+C2HT8OoQqTYBE5tGtriugGmpo=; b=Hg4STpqTQYezxdA+8I5DIjawYLpD3MKlSJG+zsEu+aDKCAN4zlCzopJ2cJ2JxN2SF3kCNI GGYVKdSxg+gAfsfntyZ6/DMWn4PMVUQOL1iV5e1rR7nLR8qWNiXdyCJ0cbOdIJEchAusWX 5H5B7xQuX/8pRXlIbgtm04aeMsOmGLDl9EzaJhWoXGZzcSXbaTJDqIex96ySIo2Gw71yRk k5J1tSOLby1rg+l0HOxmMZ60RiVmTc9qSk+thDUmU+LW6gmm6g4zU/STbAsuLeQtUVwmLG zVDM5u18IjQCFwC1qrTk4ks7Un9+XorVh9FAuZzhMr2n4nxxs6/+tqyA2Xpvjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699980722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5K1Wqk/Htn1ldVWY+C2HT8OoQqTYBE5tGtriugGmpo=; b=rtRr9K+Suecv4DONPPnr/rWjBE88oi/PIcUAxZbBay1cIQqLxEsG4BQUTiZ3LKys7kuP+X 2xym0UdhUyezBXilwULJcn7iqjL0RIL5Iu87MQTRWCTVkSHJlaxIy0oOtaAARDyj9Bm0k8 +P4MRDukdFOhCXbtoshrqqrjBCBMpe5K1jepOmtqYDX50QSRsrubTdbLZaFD4PHHNGDpvi ogAtS13LLTlT7V/h5pzU+aXs9WSqpVDgyLKRu68O7xwde/dvuuAeW6wdMHwnaJzbSD5gGE sKQrd3xc+bzsXdxOCw7dJrYsGb82OVC9DASFaNkf/PN70B99lJ9792S8cE8OMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699980722; a=rsa-sha256; cv=none; b=J/w9of8G3uwWOLpm6Wiz82GzOTcmMOpRucmal9GcTNcOexyUIm8EqAqVrfNVnHTG6xroOJ V37iyJrcQ27rn5UAiHisH0kw1RgfTKu9YEe7qfjNkJf3SyXYBKQfd+d9lmyOSJvzdBTNco CUntRDhnK98rfYJhEmtxnSa4nafjUuLisXgZkvQ0Yioz5J1/wCsfRnYf45t2bevV3zXcar BYleHymMcrXZNwgGSTOJA9e3mNm23l6GtDI7YViiG9gKE2vziAqUVPlclo82m8FK0aEX4q UJ5eA42dYtrnDg8n1ug7QheT1fS6hhlT0/y4GrYxYe6MvbVo9jVf9VpSPBvC7A== 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 4SVC4x6GW1zwx7; Tue, 14 Nov 2023 16:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AEGq1Gg015931; Tue, 14 Nov 2023 16:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AEGq1Pu015928; Tue, 14 Nov 2023 16:52:01 GMT (envelope-from git) Date: Tue, 14 Nov 2023 16:52:01 GMT Message-Id: <202311141652.3AEGq1Pu015928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: fb173fc89e9c - main - Combine and sort MK_LLVM_COV List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb173fc89e9c6908426bf60b1a449f1ff19d51df Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=fb173fc89e9c6908426bf60b1a449f1ff19d51df commit fb173fc89e9c6908426bf60b1a449f1ff19d51df Author: Brooks Davis AuthorDate: 2023-11-09 01:00:36 +0000 Commit: Brooks Davis CommitDate: 2023-11-14 16:49:55 +0000 Combine and sort MK_LLVM_COV These used to be grouped with MK_GCOV option or the like. Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 --- tools/build/mk/OptionalObsoleteFiles.inc | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 87184f021890..99e6ea1c8be3 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1985,18 +1985,6 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz OLD_FILES+=usr/share/man/man8/unstr.8.gz .endif -.if ${MK_LLVM_COV} == no -OLD_FILES+=usr/bin/gcov -OLD_FILES+=usr/share/man/man1/gcov.1.gz -.endif - -.if ${MK_LLVM_COV} == no -OLD_FILES+=usr/bin/llvm-cov -OLD_FILES+=usr/bin/llvm-profdata -OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz -OLD_FILES+=usr/share/man/man1/llvm-profdata.1.gz -.endif - .if ${MK_GH_BC} == no OLD_FILES+=usr/share/misc/bc.library OLD_FILES+=usr/tests/usr.bin/dc/Kyuafile @@ -3620,6 +3608,15 @@ OLD_FILES+=usr/share/man/man1/lldb-server.1.gz OLD_FILES+=usr/share/man/man1/lldb.1.gz .endif +.if ${MK_LLVM_COV} == no +OLD_FILES+=usr/bin/gcov +OLD_FILES+=usr/bin/llvm-cov +OLD_FILES+=usr/bin/llvm-profdata +OLD_FILES+=usr/share/man/man1/gcov.1.gz +OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz +OLD_FILES+=usr/share/man/man1/llvm-profdata.1.gz +.endif + .if ${MK_LOCALES} == no OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE