CVS commit: pkgsrc/lang/gcc12

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jun 28 19:16:00 UTC 2024

Modified Files:
        pkgsrc/lang/gcc12: Makefile.common distinfo
Removed Files:
        pkgsrc/lang/gcc12/patches: patch-fixincludes_inclhack.def

Log Message:
gcc12: restore Darwin patches


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/gcc12/Makefile.common \
    pkgsrc/lang/gcc12/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/gcc12/patches/patch-fixincludes_inclhack.def

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc12/Makefile.common
diff -u pkgsrc/lang/gcc12/Makefile.common:1.7 pkgsrc/lang/gcc12/Makefile.common:1.8
--- pkgsrc/lang/gcc12/Makefile.common:1.7       Fri Jun 28 17:55:09 2024
+++ pkgsrc/lang/gcc12/Makefile.common   Fri Jun 28 19:16:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2024/06/28 17:55:09 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2024/06/28 19:16:00 adam Exp $
 # used by lang/gcc12-libjit/Makefile
 
 GCC_PKGNAME=           gcc12
@@ -55,14 +55,13 @@ CHECK_PORTABILITY_SKIP+=    gcc/configure.o
 
 .include "options.mk"
 
-# TODO: if this is still needed, update this for 12.4.0
-#.if ${MACHINE_PLATFORM:MDarwin-*-aarch64}
-#BUILDLINK_TRANSFORM+= rm:-nodefaultrpaths
-#CONFIGURE_ARGS+=      --disable-darwin-at-rpath
-#PATCHFILES=           gcc-12.3.0.diff
-#PATCH_SITES=          https://raw.githubusercontent.com/Homebrew/formula-patches/f1188b90/gcc/
-#PATCH_DIST_STRIP=     -p1
-#.endif
+.if ${MACHINE_PLATFORM:MDarwin-*-aarch64}
+BUILDLINK_TRANSFORM+=  rm:-nodefaultrpaths
+CONFIGURE_ARGS+=       --disable-darwin-at-rpath
+PATCHFILES=            gcc-12.4.0.diff
+PATCH_SITES=           https://raw.githubusercontent.com/Homebrew/formula-patches/ca7047d/gcc/
+PATCH_DIST_STRIP=      -p1
+.endif
 
 ## For graphite support.
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
Index: pkgsrc/lang/gcc12/distinfo
diff -u pkgsrc/lang/gcc12/distinfo:1.7 pkgsrc/lang/gcc12/distinfo:1.8
--- pkgsrc/lang/gcc12/distinfo:1.7      Fri Jun 28 17:55:09 2024
+++ pkgsrc/lang/gcc12/distinfo  Fri Jun 28 19:16:00 2024
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.7 2024/06/28 17:55:09 wiz Exp $
+$NetBSD: distinfo,v 1.8 2024/06/28 19:16:00 adam Exp $
 
+BLAKE2s (gcc-12.4.0.diff) = ff17898717cb3781dd802a3376ce9a659df97d7d4a3ec3c4bd26279755ab752b
+SHA512 (gcc-12.4.0.diff) = 1e5df17525c13ff3b79117ffb426726c47a9bbb1ffb8555a75083eff5b2134c728decf765be24e4e0bb21685e60973211e359027e9b90f298e24b501cbc899aa
+Size (gcc-12.4.0.diff) = 667262 bytes
 BLAKE2s (gcc-12.4.0.tar.xz) = cf7717fff3e77f79f41e2cd298df81b5836e002b5abac1867a1d7d2a55314148
 SHA512 (gcc-12.4.0.tar.xz) = 5bd29402cad2deb5d9388d0236c7146414d77e5b8d5f1c6c941c7a1f47691c3389f08656d5f6e8e2d6717bf2c81f018d326f632fb468f42925b40bd217fc4853
 Size (gcc-12.4.0.tar.xz) = 83377372 bytes
 BLAKE2s (isl-0.16.1.tar.bz2) = 01c3fc657326e81414986eb7ede6f73e540b97009745ced125cdf7f4a8d80f61
 SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
 Size (isl-0.16.1.tar.bz2) = 1626446 bytes
-SHA1 (patch-fixincludes_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a
 SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
 SHA1 (patch-gcc_config.gcc) = 260f187048260e539e928bb04594b6394bb03912
 SHA1 (patch-gcc_config.host) = bf95dd21bfdf79d173e745fbd35c9bb99fdf4087