From nobody Sat Dec 02 00:54:55 2023 X-Original-To: dev-commits-src-branches@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 4Shs0J0KZ4z52n7y; Sat, 2 Dec 2023 00:54:56 +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 4Shs0H6d0zz3BxH; Sat, 2 Dec 2023 00:54:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478496; 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=LZKGjiOeCj4P7r/LUJl3CkB5G/jj6AJf+svw7QEFYM8=; b=e/zt7Hl7fIObIe3klzgSGH/BBXRXIKt8LLcujx2BonbukJ5Oll4qtnjOoV6xorDNAEPf1O lzi8L4UWqvRg+/pKxuY/wpxWrbedGhuZPytLA8ayWvpCZX00aahH6ss3PHxldfR8Q5Fplw we1hKfPFU4clZ6IlPapmuGJx+VKjs6PDj5cd/A9I2oky3CtxpoqWWKr4zdM2KuYqYcqgLo rJuVCnWTxMo3gSPZmwBAQ5mySMUSEzaRLyRW5dPRyQnf94C1lgab0PDdmLg7GasEs2Whpw SRA1XnZCC5C2piKgXNcfn6528d3IN82KPdZeADZRCLdUdpi1o51kyGs1zF/n+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478496; 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=LZKGjiOeCj4P7r/LUJl3CkB5G/jj6AJf+svw7QEFYM8=; b=NGZgc1/r9kwYgejW8F0D4q8twgQSvWp3V1+rz5zjSwdriAWOXaH0hZhVmoUHK3Tnybh4Bx gwx6jGuy5k4j7HPFgfF/TXkUkeE1eKUhyJwVLIR8WH+7W4oFQTIDIg6oNB+pxBxGkJwtd7 E9o+BBfHd7F0Ob0MBlV1TgXW3JMP0unq2d4cjCw4JGHIRjTZD4ABFRHzPV/o/GMxPfhxqv 4Hq4jsnL4B75a9FGKD8Y7mcjDSp9X4UKK9shvQQxo/6OxzLSeoUeN8OWkj6CojFXluIE8m 2gq6Rs1bU8kx/m75rhGn1YUXDZ18GhNjhBQ412Qr4LEvtO6/QWwd5xZ6BX6yZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478496; a=rsa-sha256; cv=none; b=hE6INW5GioP6ssuxdlEunE6HoPC9xgnGqrHM3VJKw6s5NIDIdMsQVdUMpFaWAjOoMtqUEu KACjYyL85I9waZKeLYwhZEfkQl+7Wdg3yBQF0VJclaaawADm80bw1OpTqmw2TJoAEXbEF7 C2sK0eZt/sE218DuIf123r/I9Cm6zRSnu39k6CUKST4iby1dqY3ZdV7NnByCkOGpNGUnt5 vPvfYQZVzzvgC9eJGm7EgsXNTzFXA4oYq5JxEsM2p+FTQgT1FTscY/mKVOZ20MMcyGE5ga C2puKJ2z9hUizhQp/Tcpf/47XRpEi3sH1WFIA7pNUsMI+xInW94gNO+V+yglKg== 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 4Shs0H5QypzwfF; Sat, 2 Dec 2023 00:54:55 +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 3B20stUY024998; Sat, 2 Dec 2023 00:54:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20stUC024995; Sat, 2 Dec 2023 00:54:55 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:55 GMT Message-Id: <202312020054.3B20stUC024995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: b35fc7c31542 - stable/14 - Combine and sort MK_LLVM_COV List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: b35fc7c315426e9d339a7911c18ecba0edb888e3 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b35fc7c315426e9d339a7911c18ecba0edb888e3 commit b35fc7c315426e9d339a7911c18ecba0edb888e3 Author: Brooks Davis AuthorDate: 2023-11-09 01:00:36 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:11:32 +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 (cherry picked from commit fb173fc89e9c6908426bf60b1a449f1ff19d51df) --- 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 f9867f8814a0..f3122cfb1981 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1999,18 +1999,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 @@ -3634,6 +3622,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