Bug 277383 - lang/gcc14-devel: conflicts on libgccjit.h and libgccjit++.h
Summary: lang/gcc14-devel: conflicts on libgccjit.h and libgccjit++.h
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Lorenzo Salvadore
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-02-28 22:22 UTC by Trond Endrestøl
Modified: 2024-06-10 11:07 UTC (History)
3 users (show)

See Also:
salvadore: maintainer-feedback+


Attachments
Patch for lang/gcc14-devel moving libgccjit.h and libgccjit++.h out of the way (2.82 KB, patch)
2024-04-02 20:22 UTC, Trond Endrestøl
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Trond Endrestøl 2024-02-28 22:22:53 UTC
This a repeat of PR 257060, only this time it involves lang/gcc13 (via lang/gcc) and lang/gcc14-devel. Should what was done to gcc12 in PR 257060 also be done to gcc13 now that the latter is GCC_DEFAULT? I'm sorry if I'm just making noise. Below is an excerpt from the build log of my local metaport. I can happily live without gcc14-devel.

===>   E590T-localbase-2024022700 depends on package: gcc>0 - not found
===>   Installing existing package /packages/All/gcc-13_5.pkg
Installing gcc-13_5...
Extracting gcc-13_5: ... done
===>   E590T-localbase-2024022700 depends on package: gcc>0 - found
===>   Returning to build of E590T-localbase-2024022700
===>   E590T-localbase-2024022700 depends on package: gcc14-devel>0 - not found
===>   Installing existing package /packages/All/gcc14-devel-14.0.1.s20240218,1.pkg
Installing gcc14-devel-14.0.1.s20240218,1...
pkg-static: gcc14-devel-14.0.1.s20240218,1 conflicts with gcc13-13.2.0_4 (installs files into the same place).  Problematic file: /usr/local/include/libgccjit++.h
Comment 1 Lorenzo Salvadore freebsd_committer freebsd_triage 2024-02-29 10:49:09 UTC
I think you are right and there is a fix that was applied only to some GCC ports and not others. I probably did that because I hoped to upstream the patch. Unfortunately, the upstreaming failed: I was unable to get attention from upstream on it. So I am going to apply the fix to all GCC ports in the next few days.

Thanks.
Comment 2 Gerald Pfeifer freebsd_committer freebsd_triage 2024-02-29 11:12:57 UTC
I recommend to only do this for gcc14-devel as the "representative"
of the GCC 14 line, which is the only one where there no non-devel
port exists.

And I will push upstream again. This really is not cool to let 
something like this linger there, especially when you provided 
a patch.
Comment 3 Trond Endrestøl 2024-04-02 20:22:11 UTC
Created attachment 249669 [details]
Patch for lang/gcc14-devel moving libgccjit.h and libgccjit++.h out of the way

This port built with the patch applied, and more importantly, installed successfully while lang/gcc13 was present. I'll leave the patch here in case someone else comes by and figure out they need it too.
Comment 4 commit-hook freebsd_committer freebsd_triage 2024-04-06 19:15:43 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c43b09081c53651e478e226f77d25562852a8b8b

commit c43b09081c53651e478e226f77d25562852a8b8b
Author:     Trond Endrestøl <Trond.Endrestol@ximalas.info>
AuthorDate: 2024-04-06 12:44:39 +0000
Commit:     Lorenzo Salvadore <salvadore@FreeBSD.org>
CommitDate: 2024-04-06 19:14:53 +0000

    lang/gcc14-devel: Fix conflict on libgccjit.h and libgccjit++.h

    Some GCC ports install libgccjit.h and libgccjit++.h in the
    same directory.

    Fix conflict for lang/gcc14-devel.

    See also commit 0338e04504ee269b7a95e6707f1314bc1c4239fe that fixed the
    conflict in the same way for lang/gcc11.

    PR:             257060, 277383

 lang/gcc14-devel/Makefile                             |  1 +
 lang/gcc14-devel/files/patch-gcc_Makefile.in (new)    | 19 +++++++++++++++++++
 .../files/patch-gcc_jit_Make-lang.in (new)            | 14 ++++++++++++++
 lang/gcc14-devel/pkg-plist                            |  2 --
 4 files changed, 34 insertions(+), 2 deletions(-)
Comment 5 Lorenzo Salvadore freebsd_committer freebsd_triage 2024-04-06 19:22:00 UTC
Thanks Trond, I have commited your patch.

Sorry that it took so long: I had forgotten about it.