From nobody Sat Dec 25 11:55:58 2021 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 D4B3118F3535; Sat, 25 Dec 2021 11:56: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 4JLj7M6D7qz4lR7; Sat, 25 Dec 2021 11:55:59 +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 87B0F16CD4; Sat, 25 Dec 2021 11:55:58 +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 1BPBtwdV007065; Sat, 25 Dec 2021 11:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BPBtwHu007064; Sat, 25 Dec 2021 11:55:58 GMT (envelope-from git) Date: Sat, 25 Dec 2021 11:55:58 GMT Message-Id: <202112251155.1BPBtwHu007064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 176dbfa36090 - stable/12 - Update OptionalObsoleteFiles.inc after 021385aba562 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 176dbfa3609021804e1c8b53aebb39f1a476277f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640433360; 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=4trxQswkNA9HbBPaIiCsCyQgeD+3vav1KpE2YFtE2u0=; b=fRhZ0XJL6MwHmDM2Zah5Cvrfj60MLvdheMUAyVA/cSZ+Ef7rX6kZDHvhy46SVPmoCsxfbW gjUIb6wPP/VM+QRs7aIN6SASGrznR3PKxVLfnMtWRR0maEr4cEt706va4raNDV3DLR3ek2 Snfe3HPZAJY8hpj0BeAxYKjbTwfyX2Vv9frnoT/eGkXoNj2g3+iMJPUgSD+XXp97Vql7jF WWrd5MyKftOl3y4GL/qzdlYqrmaZ52wLmex4esm1j8JISZNw5SACwor3WswMfoPVlYJOf0 gscKiPqpceVPhY0XzvdeNpzlIlZHdRsTyyl/j33ybXZOm3tSoXY/wRejcHdSUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640433360; a=rsa-sha256; cv=none; b=VEesrFU5yH/jw91Q1Qum7T6Uc6ICQaJ4YsBgxX3DZWXCZ8FQsXTTffQixwL9A8sro+XkPT Pwc0SK8RxmnRqpNagLFz6NC1NkZfEw71c3/bgSBTriVUg31K8ZLzQrTVGrYEmdGKiGL9xY lDysxoQBQ0xR3H1Oah6IpIv+SfWbQ4U824UVAfk8e7BSGXszkhZsCv4SgZiyu0ws0wemU3 mXw0dAC+MeHnwW2pg9+2fKv4aVGN7i28Kth23S/rmZTQExPm3iJRBUgDMC9Iwhep3OrqTN NkH/KMIjJIStENE8NCPrCRZZPMXXrvN4rNwMWPh7GzxVitnler4WwCmqu1lEnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=176dbfa3609021804e1c8b53aebb39f1a476277f commit 176dbfa3609021804e1c8b53aebb39f1a476277f Author: Alex Richardson AuthorDate: 2021-10-11 10:46:30 +0000 Commit: Dimitry Andric CommitDate: 2021-12-25 11:51:27 +0000 Update OptionalObsoleteFiles.inc after 021385aba562 I forgot to update this file so make delete-old would incorrectly remove the newly-installed LLVM binutils. While touching the file also update for 8e1c989abbd1 since ObsoleteFiles.inc now inludes the tablegen binaries. Reported by: Herbert J. Skuhra Reviewed By: emaste, imp Differential Revision: https://reviews.freebsd.org/D32022 (cherry picked from commit 88c027338f182e2af56d0dbabd4a94fbca6f091a) --- ObsoleteFiles.inc | 1 + tools/build/mk/OptionalObsoleteFiles.inc | 36 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index a6c2b78e3663..c9203fd9eb3b 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -42,6 +42,7 @@ OLD_FILES+=usr/bin/llvm-tblgen OLD_FILES+=usr/bin/clang-tblgen OLD_FILES+=usr/bin/lldb-tblgen +OLD_FILES+=usr/share/man/man1/llvm-tblgen.1.gz # 20211222: new clang import which bumps version from 12.0.0 to 12.0.1. OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/algorithm diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 4cb51c504d26..a07b12919aac 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1443,18 +1443,30 @@ OLD_FILES+=usr/share/man/man8/zfsloader.8.gz OLD_FILES+=usr/share/man/man8/zpool.8.gz .endif -.if ${MK_CLANG} == no -OLD_FILES+=usr/bin/clang -OLD_FILES+=usr/bin/clang++ -OLD_FILES+=usr/bin/clang-cpp -OLD_FILES+=usr/bin/clang-tblgen +.if ${MK_CLANG} == no && ${MK_LLVM_BINUTILS} == no OLD_FILES+=usr/bin/llvm-addr2line OLD_FILES+=usr/bin/llvm-ar OLD_FILES+=usr/bin/llvm-nm +OLD_FILES+=usr/bin/llvm-objcopy OLD_FILES+=usr/bin/llvm-objdump OLD_FILES+=usr/bin/llvm-ranlib +OLD_FILES+=usr/bin/llvm-size +OLD_FILES+=usr/bin/llvm-strings OLD_FILES+=usr/bin/llvm-symbolizer -OLD_FILES+=usr/bin/llvm-tblgen +OLD_FILES+=usr/share/man/man1/llvm-addr2line.1.gz +OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz +OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz +OLD_FILES+=usr/share/man/man1/llvm-objcopy.1.gz +OLD_FILES+=usr/share/man/man1/llvm-ranlib.1.gz +OLD_FILES+=usr/share/man/man1/llvm-size.1.gz +OLD_FILES+=usr/share/man/man1/llvm-strings.1.gz +OLD_FILES+=usr/share/man/man1/llvm-symbolizer.1.gz +.endif + +.if ${MK_CLANG} == no +OLD_FILES+=usr/bin/clang +OLD_FILES+=usr/bin/clang++ +OLD_FILES+=usr/bin/clang-cpp OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/algorithm OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/complex OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/new @@ -1753,12 +1765,6 @@ OLD_DIRS+=usr/share/doc/llvm OLD_FILES+=usr/share/man/man1/clang.1.gz OLD_FILES+=usr/share/man/man1/clang++.1.gz OLD_FILES+=usr/share/man/man1/clang-cpp.1.gz -OLD_FILES+=usr/share/man/man1/llvm-addr2line.1.gz -OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz -OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz -OLD_FILES+=usr/share/man/man1/llvm-ranlib.1.gz -OLD_FILES+=usr/share/man/man1/llvm-symbolizer.1.gz -OLD_FILES+=usr/share/man/man1/llvm-tblgen.1.gz .endif .if ${MK_CLANG_EXTRAS} == no @@ -1779,11 +1785,8 @@ OLD_FILES+=usr/bin/llvm-lto2 OLD_FILES+=usr/bin/llvm-mc OLD_FILES+=usr/bin/llvm-mca OLD_FILES+=usr/bin/llvm-modextract -OLD_FILES+=usr/bin/llvm-objcopy OLD_FILES+=usr/bin/llvm-pdbutil OLD_FILES+=usr/bin/llvm-rtdyld -OLD_FILES+=usr/bin/llvm-size -OLD_FILES+=usr/bin/llvm-strings OLD_FILES+=usr/bin/llvm-xray OLD_FILES+=usr/bin/opt OLD_FILES+=usr/share/man/man1/bugpoint.1.gz @@ -1796,10 +1799,7 @@ OLD_FILES+=usr/share/man/man1/llvm-dis.1.gz OLD_FILES+=usr/share/man/man1/llvm-dwarfdump.1 OLD_FILES+=usr/share/man/man1/llvm-extract.1.gz OLD_FILES+=usr/share/man/man1/llvm-link.1.gz -OLD_FILES+=usr/share/man/man1/llvm-objcopy.1.gz OLD_FILES+=usr/share/man/man1/llvm-pdbutil.1.gz -OLD_FILES+=usr/share/man/man1/llvm-size.1.gz -OLD_FILES+=usr/share/man/man1/llvm-strings.1.gz OLD_FILES+=usr/share/man/man1/opt.1.gz .endif