From nobody Tue Feb 28 20: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 4PR8gQ3dWtz3twT1; Tue, 28 Feb 2023 20: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 4PR8gP71htz40FT; Tue, 28 Feb 2023 20:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677617522; 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=ANAiUWI/ASyiFnJ6zypQ+sBFEGattBREY7914TZAAT4=; b=TxKdsbYyjNRNUTraCJ93PyyUAJDL7ifncuEsvaqs8rWIX3rahoo/rTzxogtDyk+4bZzmrw akACfaCj0+LOqkUJxuYe5Oy+jgzb/KG+HaTt8qeAOFtcOZScPgVLvQSnKtXa2eggjIgUT4 ui1RUwrb+/G64hwnh1Gp/PSGVn18ZTgcuMulRX/4GZJEPguQd6J6SP+2IVugSxEwO+rcn3 26P7zROjFtKTxS+k4OosUcFGjK6QxNtiFCFOymA9OxOjvNvh2C9R1dLf5Wf55tqLuowT5x hbt1IQK/+5s0YlegeBO6R3W4o/xtPRTNKcESsqunLLijISwJrI9MlVB/GWKo4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677617522; 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=ANAiUWI/ASyiFnJ6zypQ+sBFEGattBREY7914TZAAT4=; b=P/xm7wbwHVIIYPhF/4hLp2Mw/4P8FR1uJlhX1RVfzZ0wcbmB0QzleI3cuFbUzDQjUU8pgn 57wY7Y+x+VE5zbBx1zxK18bmJf6lfLjKkCCixCsoI1514EpSd4gW7KWAn5zo4oJipkrwwq x2zOpg2VpZTAxnFa2WcZZShAZi/WiemzMxSkb2dZJf6PmTCqIkaIyLUlP2TGX+zbZDCxaE +VRaPdGPFP/+DcsTLpavSOdOwXrN3SijvY64hOKhWagg+z5T2a3C3g1uDhLhjiTmn9sTI6 ELxV6cyiBe5xOU97wdZQ0KHpQ5VWREnmDy2fmDka/ojvzgZkG3tqaOePBDDOKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677617522; a=rsa-sha256; cv=none; b=AppR9yvjDkEEuhNAQqSwoYGl58FDVuGSxNTyC1frr0eQF/Qp3k/5yNtms3s9URJQD7OPAQ zgHK9cv3Ci3jCmo32gCf2CZpBxTpE17etnZ5Rf+H9lK3yXwdzLFR1x/8aYGin/dpu1yr7/ efYvfUnK/QYclVdu17QjUL6VKU9XTqjzOZh3ELtzg4gaVhGkCs50j2/IRQlyaW5pYuhT+T fEYEPBBK62d7BA1wTE0gfTcSabhv7SB3uUIbSnWuh95Z6XN8KaMUcV2mTuCeWUXwzZBYUl nSF8TG02aG55mgcEFc666AFnWqWSxRgncx+xu46bzR7dPyYX0JYYcih0RM20dQ== 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 4PR8gP62lwz1M2Y; Tue, 28 Feb 2023 20:52:01 +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 31SKq1BP062936; Tue, 28 Feb 2023 20:52:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SKq1h3062935; Tue, 28 Feb 2023 20:52:01 GMT (envelope-from git) Date: Tue, 28 Feb 2023 20:52:01 GMT Message-Id: <202302282052.31SKq1h3062935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d29b33328174 - stable/13 - Do not delete objdump when WITH_LLVM_BINUTILS is true 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d29b333281746cf9a68a247a79991585cdf38732 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d29b333281746cf9a68a247a79991585cdf38732 commit d29b333281746cf9a68a247a79991585cdf38732 Author: Ed Maste AuthorDate: 2022-09-25 19:29:38 +0000 Commit: Ed Maste CommitDate: 2023-02-28 20:51:33 +0000 Do not delete objdump when WITH_LLVM_BINUTILS is true WITH_LLVM_BINUTILS links /usr/bin/objdump to llvm-objdump, and similarly for the man page. Do not delete them in `make delete-old`. PR: 266603 Sponsored by: The FreeBSD Foundation (cherry picked from commit d1a351be19d4bd03918d44ea33fa7c09655f810a) --- ObsoleteFiles.inc | 4 ---- tools/build/mk/OptionalObsoleteFiles.inc | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 64214e29e93f..37f07a708986 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -3277,10 +3277,6 @@ OLD_FILES+=usr/include/crypto/skipjack.h # 20200511: Remove ubsec(4) OLD_FILES+=usr/share/man/man4/ubsec.4.gz -# 20200506: GNU objdump 2.17.50 retired -OLD_FILES+=usr/bin/objdump -OLD_FILES+=usr/share/man/man1/objdump.1.gz - # 20200428: route_var.h moved to net/route OLD_FILES+=usr/include/net/route_var.h diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 7131c4e3d8ac..c3febff5800e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2095,6 +2095,11 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz OLD_FILES+=usr/share/man/man8/unstr.8.gz .endif +.if ${MK_LLVM_BINUTILS} == no +OLD_FILES+=usr/bin/objdump +OLD_FILES+=usr/share/man/man1/objdump.1.gz +.endif + .if ${MK_LLVM_COV} == no && !defined(WITH_PORT_BASE_GCC) OLD_FILES+=usr/bin/gcov OLD_FILES+=usr/share/man/man1/gcov.1.gz