CVS commit: pkgsrc/lang

["Dmytro Kazankov" <dkazankov%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Fri Apr 25 12:33:45 UTC 2025

Modified Files:
        pkgsrc/lang/gcc13-gnat: Makefile distinfo
        pkgsrc/lang/gcc13-gnat-libs: Makefile
        pkgsrc/lang/gcc13-gnat/patches: patch-libgcc_config.host

Log Message:
gcc13-gnat,-libs: import common patches for MacOS from lang/gcc13


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/gcc13-gnat/Makefile \
    pkgsrc/lang/gcc13-gnat/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc13-gnat-libs/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/gcc13-gnat/patches/patch-libgcc_config.host

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

Modified files:

Index: pkgsrc/lang/gcc13-gnat/Makefile
diff -u pkgsrc/lang/gcc13-gnat/Makefile:1.5 pkgsrc/lang/gcc13-gnat/Makefile:1.6
--- pkgsrc/lang/gcc13-gnat/Makefile:1.5 Mon Apr 21 20:26:50 2025
+++ pkgsrc/lang/gcc13-gnat/Makefile     Fri Apr 25 12:33:45 2025
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2025/04/21 20:26:50 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2025/04/25 12:33:45 dkazankov Exp $
 
 GCC_PKGNAME=           gcc13
 GCC_DIST_VERSION=      13.3.0
 
 PKGNAME=       ${GCC_PKGNAME}-gnat-${GCC_DIST_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       GNAT Compiler and Ada tools
 DISTNAME=      gcc-${GCC_DIST_VERSION}
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.xz
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    dkazankov%NetBSD.org@localhost
 HOMEPAGE=      https://gcc.gnu.org/
 LICENSE=       gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 
Index: pkgsrc/lang/gcc13-gnat/distinfo
diff -u pkgsrc/lang/gcc13-gnat/distinfo:1.5 pkgsrc/lang/gcc13-gnat/distinfo:1.6
--- pkgsrc/lang/gcc13-gnat/distinfo:1.5 Sat Feb  8 14:05:03 2025
+++ pkgsrc/lang/gcc13-gnat/distinfo     Fri Apr 25 12:33:45 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2025/02/08 14:05:03 wiz Exp $
+$NetBSD: distinfo,v 1.6 2025/04/25 12:33:45 dkazankov Exp $
 
 BLAKE2s (gcc-13.3.0.tar.xz) = d204b8987b4780b569f28226cbfff34ae27124e529857c36ff90d5d40ef0b511
 SHA512 (gcc-13.3.0.tar.xz) = ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801
@@ -30,7 +30,11 @@ SHA1 (patch-gcc_tree.h) = e487cd4ac071b1
 SHA1 (patch-gnattools_configure) = 403e5576506d1a7f42740dcbfc79c1aee3333169
 SHA1 (patch-libffi_configure) = 392e46774fdf732bd07de35082d469cc325678ea
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 89e2dd6aaf2c1f75726f02362d8a8bf7178694ea
-SHA1 (patch-libgcc_config.host) = 9e0d4c04cfd0f0336cb903c18bc4c0fe007dd005
+SHA1 (patch-libgcc_config.host) = e3c3bc36f9f18e4b0864f10aa464774e133339c1
+SHA1 (patch-libgcc_config_i386_t-darwin) = 5c719be042134bf33f7d4d2bde63573f37df9a84
+SHA1 (patch-libgcc_config_rs6000_t-darwin) = a88cca89c7f28997e28b81d830b96613f23978ec
+SHA1 (patch-libgcc_config_t-darwin-libgccs1) = 75e5c3467bfd5716519a65f4d1a6da169486999e
+SHA1 (patch-libgcc_config_t-darwin-min-11) = 8bf932c0c2769c5e2e191626976af31f1c57df7e
 SHA1 (patch-libgcc_crtstuff.c) = a16d465039de00c195cf0694560140a9c38f3a25
 SHA1 (patch-libgfortran_io_io.h) = b47b12022d1e1aad7c3997542f83dc451c33e62b
 SHA1 (patch-libquadmath_printf_quadmath-printf.c) = 78e09f1e6d61ee57cee83275093cf46b2335d204

Index: pkgsrc/lang/gcc13-gnat-libs/Makefile
diff -u pkgsrc/lang/gcc13-gnat-libs/Makefile:1.1 pkgsrc/lang/gcc13-gnat-libs/Makefile:1.2
--- pkgsrc/lang/gcc13-gnat-libs/Makefile:1.1    Sat Feb  8 14:05:50 2025
+++ pkgsrc/lang/gcc13-gnat-libs/Makefile        Fri Apr 25 12:33:45 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2025/02/08 14:05:50 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2025/04/25 12:33:45 dkazankov Exp $
 
 GCC_PKGNAME=           gcc13
 GCC13_DIST_VERSION=    13.3.0
@@ -8,12 +8,12 @@ PKGNAME=      ${GCC_PKGNAME}-gnat-libs-${GCC1
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc13 package so that with the dependence pattern
 ## '{gcc13,gcc13-libs}>=13.1.*' pkg_add will choose gcc13-libs over gcc13.
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    lang
 MASTER_SITES=  # empty
 DISTFILES=     # empty
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    dkazankov%NetBSD.org@localhost
 HOMEPAGE=      https://gcc.gnu.org/
 COMMENT=       The GNU Compiler Collection (GCC) support shared libraries
 LICENSE=       gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3

Index: pkgsrc/lang/gcc13-gnat/patches/patch-libgcc_config.host
diff -u pkgsrc/lang/gcc13-gnat/patches/patch-libgcc_config.host:1.2 pkgsrc/lang/gcc13-gnat/patches/patch-libgcc_config.host:1.3
--- pkgsrc/lang/gcc13-gnat/patches/patch-libgcc_config.host:1.2 Sat Feb  8 14:05:03 2025
+++ pkgsrc/lang/gcc13-gnat/patches/patch-libgcc_config.host     Fri Apr 25 12:33:45 2025
@@ -1,11 +1,72 @@
-$NetBSD: patch-libgcc_config.host,v 1.2 2025/02/08 14:05:03 wiz Exp $
+$NetBSD: patch-libgcc_config.host,v 1.3 2025/04/25 12:33:45 dkazankov Exp $
 
-This is needed for arm64 to get Out-of-line LSE atomics linked into libgcc.
+Part 1: drop legacy library build for macOS >= 14 [PR116809].
+
+This is a mixture of two upstream patches.  See
+
+     https://github.com/gcc-mirror/gcc/blob/master/libgcc/config.host
+
+libgcc, Darwin: Drop the legacy library build for macOS >= 15 [PR116809].
+
+We have been building a legacy libgcc_s.1 DSO to support code that
+was built with older compilers.
+
+From macOS 15,  the unwinder no longer exports some of the symbols used
+in that library which (a) cuases bootstrap fail and (b) means that the
+legacy library is no longer useful.
+
+No open branch of GCC emits references to this library - and any already
+-built code that depends on the symbols would need rework anyway.
+
+       PR target/116809
+
+libgcc, Darwin: Don't build legacy libgcc_s.1 on macOS 14 [PR116809]
+
+d9cafa0 stopped building libgcc_s.1 on macOS >= 15, in part because
+that is required to bootstrap the compiler using the macOS 15 SDK. The
+macOS 15 SDK ships in Xcode 16, which also runs on macOS 14. libgcc_s.1
+can no longer be built on macOS 14 using Xcode 16 by the same logic that
+the previous change disabled it for macOS 15.
+
+       PR target/116809
+
+Parts 2-3: 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    2024-05-21 10:47:41.000000000 +0300
+--- libgcc/config.host.orig    2024-05-21 07:47:41.000000000 +0000
 +++ libgcc/config.host
-@@ -406,6 +406,7 @@
+@@ -235,19 +235,25 @@ case ${host} in
+   tmake_file="$tmake_file t-slibgcc-darwin"
+   # newer toolsets produce warnings when building for unsupported versions.
+   case ${host} in
+-    *-*-darwin1[89]* | *-*-darwin2* )
+-      tmake_file="t-darwin-min-8 $tmake_file"
++    x86_64-*-darwin2[0-2]*)
++      tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file"
++      ;;
++    *-*-darwin2*)
++      tmake_file="t-darwin-min-11 $tmake_file"
++      ;;
++    *-*-darwin1[89]*)
++      tmake_file="t-darwin-min-8 t-darwin-libgccs1 $tmake_file"
+       ;;
+     *-*-darwin9* | *-*-darwin1[0-7]*)
+-      tmake_file="t-darwin-min-5 $tmake_file"
++      tmake_file="t-darwin-min-5 t-darwin-libgccs1 $tmake_file"
+       ;;
+     *-*-darwin[4-8]*)
+-      tmake_file="t-darwin-min-1 $tmake_file"
++      tmake_file="t-darwin-min-1 t-darwin-libgccs1 $tmake_file"
+       ;;
+     *)
+       # Fall back to configuring for the oldest system known to work with
+       # all archs and the current sources.
+-      tmake_file="t-darwin-min-5 $tmake_file"
++      tmake_file="t-darwin-min-5 t-darwin-libgccs1 $tmake_file"
+       echo "Warning: libgcc configured to support macOS 10.5" 1>&2
+       ;;
+   esac
+@@ -406,6 +412,7 @@ aarch64*-*-freebsd*)
  aarch64*-*-netbsd*)
        extra_parts="$extra_parts crtfastmath.o"
        tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
@@ -13,7 +74,7 @@ libsupc++ fails to link without this, an
        tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm"
        tmake_file="${tmake_file} t-dfprules"
        md_unwind_header=aarch64/aarch64-unwind.h
-@@ -497,7 +498,8 @@
+@@ -497,7 +504,8 @@ arm*-*-netbsdelf*)
        case ${host} in
          arm*-*-netbsdelf-*eabi*)
            tmake_file="${tmake_file} arm/t-netbsd-eabi"