COMMIT_MSG

[Brook Milligan (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Brook Milligan <brook%nmsu.edu@localhost>
Pushed By:	brook
Date:		Fri Jan 3 14:27:56 2025 -0700
Changeset:	8548ecad6283aa7bbbdcc159a0d1c2f1e9d75d2b

Modified Files:
	gcc12/Makefile.common
	gcc12/distinfo
Removed Files:
	gcc12/patches/patch-libgcc_config.host

Log Message:
COMMIT_MSG

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8548ecad6283aa7bbbdcc159a0d1c2f1e9d75d2b

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

diffstat:
 gcc12/Makefile.common                  | 12 +++++++++++-
 gcc12/distinfo                         |  7 ++++++-
 gcc12/patches/patch-libgcc_config.host | 25 -------------------------
 3 files changed, 17 insertions(+), 27 deletions(-)

diffs:
diff --git a/gcc12/Makefile.common b/gcc12/Makefile.common
index f022298cea..9c6bddab11 100644
--- a/gcc12/Makefile.common
+++ b/gcc12/Makefile.common
@@ -57,12 +57,22 @@ CHECK_PORTABILITY_SKIP+=	gcc/configure.orig_dist
 
 .include "options.mk"
 
-.if ${MACHINE_PLATFORM:MDarwin-*-aarch64}
+# note: homebrew patchset should work for both x86_64 and aarch64, but
+#       may only work up to Sonoma (MacOS v14, Darwin v23)
+# see:  https://formulae.brew.sh/formula/gcc@12
+#
+.if ${OPSYS} == "Darwin" && ${OPSYS_VERSION} < 150000
 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
+.elif ${OPSYS} == "Darwin"
+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
+PATCH_SITES=		ftp://ftp.netbsd.org/pub/pkgsrc/distfiles
 .endif
 
 ## For graphite support.
diff --git a/gcc12/distinfo b/gcc12/distinfo
index 4ea2e1f2a3..78ab02b3c4 100644
--- a/gcc12/distinfo
+++ b/gcc12/distinfo
@@ -3,6 +3,12 @@ $NetBSD: distinfo,v 1.10 2024/12/20 09:29:10 jperkin 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-Darwin-x86_64.diff) = 657396d893235af7940672e6a77e9edc489de194cdb7a654c73bceadad714f05
+SHA512 (gcc-12.4.0-Darwin-x86_64.diff) = 591cb2cff8310ba09babafea39dad87b2ab5431dcd22083df858a6010081a794d78b7d01d3dbda2262e910e3e8f4a63ae492b2fa892f16224e0b916db177f805
+Size (gcc-12.4.0-Darwin-x86_64.diff) = 6489 bytes
+BLAKE2s (gcc-12.4.0-patch-libgcc_config.host) = 7c2643ff3143b619e556dc710bd3993bc523a22f709375fe3ca8e8a8644c77cf
+SHA512 (gcc-12.4.0-patch-libgcc_config.host) = 96fa0f067d382807793a7fcb83036db32b46728bf7a3f5c60dfcbe02712345293bde641c8bbc3edb5c121d1f73c7e72aea15739c57b5e53ff375712c969e843b
+Size (gcc-12.4.0-patch-libgcc_config.host) = 3279 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
@@ -24,7 +30,6 @@ SHA1 (patch-gcc_targhooks.cc) = 3bd54b7c3efc310aa2277f33cbd87b4a877cafea
 SHA1 (patch-isl_configure) = 5523c76d95b229b3cd25461b4c2b7af24bf2534e
 SHA1 (patch-libffi_configure) = 919bbe094e3ce547a0186eeaddb20a662595f79a
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 89e2dd6aaf2c1f75726f02362d8a8bf7178694ea
-SHA1 (patch-libgcc_config.host) = d40d4d08c807eeff98cc246d1ea756b5b2c749b0
 SHA1 (patch-libgcc_crtstuff.c) = a16d465039de00c195cf0694560140a9c38f3a25
 SHA1 (patch-libgfortran_io_io.h) = d44676239a7f45e42054d24bd5224f43c20055c0
 SHA1 (patch-libquadmath_printf_quadmath-printf.c) = 78e09f1e6d61ee57cee83275093cf46b2335d204
diff --git a/gcc12/patches/patch-libgcc_config.host b/gcc12/patches/patch-libgcc_config.host
deleted file mode 100644
index da417b6afb..0000000000
--- a/gcc12/patches/patch-libgcc_config.host
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-libgcc_config.host,v 1.3 2024/12/20 09:29:10 jperkin Exp $
-
-This is needed for arm64 to get Out-of-line LSE atomics linked into libgcc.
-libsupc++ fails to link without this, and for arm to build.
-
---- libgcc/config.host.orig	2021-04-08 04:56:29.805761640 -0700
-+++ libgcc/config.host	2022-02-02 04:08:51.653635705 -0800
-@@ -377,6 +377,7 @@
- aarch64*-*-netbsd*)
- 	extra_parts="$extra_parts crtfastmath.o"
- 	tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
-+	tmake_file="${tmake_file} ${cpu_type}/t-lse"
- 	tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm"
- 	md_unwind_header=aarch64/aarch64-unwind.h
- 	;;
-@@ -463,7 +464,8 @@
- 	case ${host} in
- 	  arm*-*-netbsdelf-*eabi*)
- 	    tmake_file="${tmake_file} arm/t-netbsd-eabi"
--	    unwind_header=config/arm/unwind-arm.h
-+	    # GCC 7 vs NetBSD/eabi -> avoid arm unwinder
-+	    #unwind_header=config/arm/unwind-arm.h
- 	    ;;
- 	  *)
- 	    tmake_file="${tmake_file} arm/t-netbsd t-slibgcc-gld-nover"