Bug 266603 - Spurious deletion of /usr/bin/objdump
Summary: Spurious deletion of /usr/bin/objdump
Status: Closed FIXED
Alias: None
Product: Base System
Classification: Unclassified
Component: bin (show other bugs)
Version: 13.1-STABLE
Hardware: Any Any
: --- Affects Only Me
Assignee: Ed Maste
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-09-25 14:34 UTC by Philippe Michel
Modified: 2023-02-28 20:52 UTC (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Philippe Michel 2022-09-25 14:34:04 UTC 
When WITH_LLVM_BINUTILS is true, make installworld links /usr/bin/objdump to /usr/bin/llvm-objdump (and does something similar for the man page).

But make delete-old wants to remove these files due to the following entries in ObsoleteFiles.inc:
# 20200506: GNU objdump 2.17.50 retired
OLD_FILES+=usr/bin/objdump
OLD_FILES+=usr/share/man/man1/objdump.1.gz

I suppose these removals should only happen if WITH_LLVM_BINUTILS is false.
Comment 1 commit-hook freebsd_committer freebsd_triage 2022-09-25 19:34:04 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=d1a351be19d4bd03918d44ea33fa7c09655f810a

commit d1a351be19d4bd03918d44ea33fa7c09655f810a
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-09-25 19:29:38 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-09-25 19:33:16 +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

 ObsoleteFiles.inc                        | 4 ----
 tools/build/mk/OptionalObsoleteFiles.inc | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)
Comment 2 commit-hook freebsd_committer freebsd_triage 2023-02-28 20:52:19 UTC 
A commit in branch stable/13 references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=d29b333281746cf9a68a247a79991585cdf38732

commit d29b333281746cf9a68a247a79991585cdf38732
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-09-25 19:29:38 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
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(-)
Comment 3 Ed Maste freebsd_committer freebsd_triage 2023-02-28 20:52:45 UTC 
Merged to stable/13 now. Thank you for the report!