gcc12: Use distribution patches for libgcc/config.host
authorBrook Milligan <brook@nmsu.edu>
Fri, 3 Jan 2025 21:43:57 +0000 (14:43 -0700)
committerBrook Milligan <brook@nmsu.edu>
Fri, 3 Jan 2025 21:43:57 +0000 (14:43 -0700)
There are three conflicting patches for libgcc/config.host: (i) the
lang/gcc12 version which is applied for most platforms, (ii) one from
homebrew which is applied for Darwin/aarch64 (but should work for all
Darwin up to v23), and (iii) one intended to fix Darwin v24.  This
commit applies these patches conditionally using distribution
patchsets so that they can be tested.

gcc12/Makefile.common

index 9c6bddab117847ea2a570547283945995e046c6b..a61d73024051bf8b6fb62e7c5bcd9ba096855525 100644 (file)
@@ -71,7 +71,7 @@ PATCH_DIST_STRIP=     -p1
 PATCHFILES=            gcc-12.4.0-Darwin-x86_64.diff
 PATCH_SITES=           ftp://ftp.netbsd.org/pub/pkgsrc/distfiles
 .else # use a distribution patchset to avoid conflicts with above
-PATCHFILES=            gcc-12.4.0-gcc-12.4.0-patch-libgcc_config.host
+PATCHFILES=            gcc-12.4.0-patch-libgcc_config.host
 PATCH_SITES=           ftp://ftp.netbsd.org/pub/pkgsrc/distfiles
 .endif