Bug 293610 - pkgbase: c++filt conflict after base 5d757312ad59
Summary: pkgbase: c++filt conflict after base 5d757312ad59
Status: Closed FIXED
Alias: None
Product: Base System
Classification: Unclassified
Component: bin (show other bugs)
Version: 16.0-CURRENT
Hardware: Any Any
: --- Affects Only Me
Assignee: Ed Maste
URL:
Keywords: regression
Depends on:
Blocks:
 
Reported: 2026-03-06 02:46 UTC by Evgenii Khramtsov (Inactive)
Modified: 2026-03-06 15:53 UTC (History)
4 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Evgenii Khramtsov (Inactive) 2026-03-06 02:46:53 UTC
See base 5d757312ad59

Though my local environment is not vanilla (WITHOUT_CLANG_FULL=yes + WITH_LLVM_LINK_STATIC_LIBRARIES=yes + -b llvm-21-update https://github.com/DimitryAndric/freebsd-src.git )

After make update-packages and pkg upgrade several times I get:

# pkg upgrade
Updating base repository catalogue...
base repository is up to date.
Updating ports repository catalogue...
ports repository is up to date.
All repositories are up to date.
Checking for upgrades (1 candidates): 100%
Processing candidates (1 candidates): 100%
Checking integrity... done (1 conflicting)
  - FreeBSD-toolchain-16.snap20260306014845 [base] conflicts with FreeBSD-clang-16.snap20260306014845 [installed] on /usr/bin/c++filt
Cannot solve problem using SAT solver, trying another plan
Checking integrity... done (0 conflicting)
The following 1 package(s) will be affected (of 0 checked):

Installed packages to be REINSTALLED:
	pkg-2.6.2 [ports]

Number of packages to be reinstalled: 1

Proceed with this action? [y/N]:
Comment 1 Karl Grose 2026-03-06 04:08:17 UTC
My experience is similar. After upgrading CURRENT using pkg upgrade -r FreeBSD-base:

=======
sudo -i
[root@fwd-fbsd16c ~]# pkg upgrade
Updating FreeBSD-ports repository catalogue...
FreeBSD-ports repository is up to date.
Updating FreeBSD-ports-kmods repository catalogue...
FreeBSD-ports-kmods repository is up to date.
Updating FreeBSD-base repository catalogue...
FreeBSD-base repository is up to date.
All repositories are up to date.
Checking for upgrades (423 candidates): 100%
Processing candidates (423 candidates): 100%
Checking integrity... done (2 conflicting)
  - FreeBSD-toolchain-16.snap20260305150945 [FreeBSD-base] conflicts with FreeBSD-clang-16.snap20260305150945 [installed] on /usr/bin/c++filt
  - FreeBSD-toolchain-16.snap20260305150945 [FreeBSD-base] conflicts with FreeBSD-clang-16.snap20260305150945 [FreeBSD-base] on /usr/bin/c++filt
Cannot solve problem using SAT solver, trying another plan
Checking integrity... done (0 conflicting)
The following 1 package(s) will be affected (of 0 checked):

Installed packages to be REINSTALLED:
        pkg-2.6.0 [FreeBSD-ports]

Number of packages to be reinstalled: 1

Proceed with this action? [y/N]: n
=======

Selecting "y" reinstalls pkg, but the upgrade problem persists.
Comment 2 commit-hook freebsd_committer freebsd_triage 2026-03-06 14:51:34 UTC
A commit in branch main references this bug:

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

commit 42e4df8b853186190b61428f0bd0f923cc525033
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2026-03-06 14:47:53 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2026-03-06 14:50:54 +0000

    usr.bin: Exclude ELF Tool Chain cxxfilt build

    when LLVM_BINUTILS is enabled (which is the default).

    PR: 293610
    Fixes: 5d757312ad59 ("build: Retire LLVM_CXXFILT option")
    Sponsored by: The FreeBSD Foundation

 usr.bin/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 3 Ed Maste freebsd_committer freebsd_triage 2026-03-06 14:55:17 UTC
Thanks for the report, should now be fixed. This also uncovered another issue, that cxxfilt should be in the toolchain package not clang, which will get fixed in a later change.
Comment 4 commit-hook freebsd_committer freebsd_triage 2026-03-06 15:53:50 UTC
A commit in branch main references this bug:

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

commit 88dedd16ba659ea43bf5572a85e6f8151ee3fd87
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2026-03-06 15:49:22 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2026-03-06 15:52:37 +0000

    llvm-cxxfilt: Install as c++filt only with LLVM_BINUTILS

    When building WITHOUT_LLVM_BINUTILS /usr/bin/c++filt is the one from
    ELF Tool Chain.

    PR: 293610
    Fixes: 5d757312ad59 ("build: Retire LLVM_CXXFILT option")
    Sponsored by: The FreeBSD Foundation

 usr.bin/clang/llvm-cxxfilt/Makefile | 2 ++
 1 file changed, 2 insertions(+)