> On Dec 19, 2024, at 13:01, maya%netbsd.org@localhost <maya%NetBSD.org@localhost> wrote: > > There are two things changing libgcc/config.host in lang/gcc12: > patches/patch-libgcc_config.host, but also gcc-12.4.0.diff, a > downloaded patch file. Thanks for noticing this. The problem is that the downloaded patch only applies to Darwin-*-aarch64. I believe my patches are fine everywhere else, as they are built against the unpatched distfile. I think this means platform-specific patches, but I have no idea how we handle that. For reference, I have attached the two conflicting blocks, one from each patch; note that both patches have more blocks in them that affect other parts of the same file. Suggestions on how to handle this are welcome. Cheers, Brook
Attachment:
gcc-12.4.0.diff
Description: Binary data
Attachment:
patch-licgcc_config.host
Description: Binary data