CVS commit: pkgsrc/lang/gcc14

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jun 20 07:05:19 UTC 2025

Modified Files:
        pkgsrc/lang/gcc14: distinfo options.mk
        pkgsrc/lang/gcc14/patches: patch-gcc_config_aarch64_aarch64-tune.md
Added Files:
        pkgsrc/lang/gcc14/patches: patch-zlib_zutil.h

Log Message:
gcc14: fix build with Xcode 16.3; fix options.mk for always-libgcc


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/gcc14/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc14/options.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/gcc14/patches/patch-gcc_config_aarch64_aarch64-tune.md
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gcc14/patches/patch-zlib_zutil.h

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

Modified files:

Index: pkgsrc/lang/gcc14/distinfo
diff -u pkgsrc/lang/gcc14/distinfo:1.8 pkgsrc/lang/gcc14/distinfo:1.9
--- pkgsrc/lang/gcc14/distinfo:1.8      Sun Jun  8 07:37:45 2025
+++ pkgsrc/lang/gcc14/distinfo  Fri Jun 20 07:05:18 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2025/06/08 07:37:45 wiz Exp $
+$NetBSD: distinfo,v 1.9 2025/06/20 07:05:18 adam Exp $
 
 BLAKE2s (gcc-14.3.0.tar.xz) = 70036c7d07767bba3476d19a6fd52f0b09dc05651c6cf5d136afe18ffa3b63a9
 SHA512 (gcc-14.3.0.tar.xz) = cb4e3259640721bbd275c723fe4df53d12f9b1673afb3db274c22c6aa457865dccf2d6ea20b4fd4c591f6152e6d4b87516c402015900f06ce9d43af66d3b7a93
@@ -33,7 +33,7 @@ SHA1 (patch-gcc_config_aarch64_aarch64-c
 SHA1 (patch-gcc_config_aarch64_aarch64-cores.def) = ae9664ad30826fa7fc5c247faf15d7364a000ac0
 SHA1 (patch-gcc_config_aarch64_aarch64-netbsd.h) = abf19e2445bce1773162bddef16cd7f41eb36827
 SHA1 (patch-gcc_config_aarch64_aarch64-protos.h) = d9b90df2600b7d92bca098d9dc4ac965fe94983c
-SHA1 (patch-gcc_config_aarch64_aarch64-tune.md) = 348c478781b970feefbf683b66ade0065720f099
+SHA1 (patch-gcc_config_aarch64_aarch64-tune.md) = 4c3d2f4d757e75e6f154936ae6cb0b409aabd8f2
 SHA1 (patch-gcc_config_aarch64_aarch64.cc) = 3de2cc5fe4f4da6ca25b8f7ef0ef659d7bec51f8
 SHA1 (patch-gcc_config_aarch64_aarch64.h) = b2e297c5a37d07b5d360566d111ce7b5c561209d
 SHA1 (patch-gcc_config_aarch64_aarch64.md) = 547637f1096d544897ee906c67f7d18b070ab4cc
@@ -102,3 +102,4 @@ SHA1 (patch-libphobos_libdruntime_core_i
 SHA1 (patch-libquadmath_printf_quadmath-printf.c) = 78e09f1e6d61ee57cee83275093cf46b2335d204
 SHA1 (patch-libquadmath_strtod_strtod__l.c) = 6142c10d34174174cce7f06c37eab04dc431b2dc
 SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = 891ec8488516592ea2065509b7310c55d7a367ad
+SHA1 (patch-zlib_zutil.h) = ef6f2439488a1b97bca9c33fc16e2e7447f0d158

Index: pkgsrc/lang/gcc14/options.mk
diff -u pkgsrc/lang/gcc14/options.mk:1.1 pkgsrc/lang/gcc14/options.mk:1.2
--- pkgsrc/lang/gcc14/options.mk:1.1    Fri Jun 28 18:35:16 2024
+++ pkgsrc/lang/gcc14/options.mk        Fri Jun 20 07:05:18 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/06/28 18:35:16 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2025/06/20 07:05:18 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${GCC_PKGNAME}
 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -57,7 +57,7 @@ PKG_SUGGESTED_OPTIONS+=       gcc-multilib
 .  for _libdir_ in ${_OPSYS_LIB_DIRS}
 .    if exists(${_libdir_})
 BASE_LIBGCC!=                  find ${_libdir_} -name libgcc_s.so 2> /dev/null
-BASE_LIBGCC_MATCH_STRING!=     ${ECHO} ${BASE_LIBGCC} ${GCC13_DIST_VERSION} | \
+BASE_LIBGCC_MATCH_STRING!=     ${ECHO} ${BASE_LIBGCC} ${GCC14_DIST_VERSION} | \
                                ${AWK} -f ../../mk/scripts/larger_symbol_version.awk
 .      if ${BASE_LIBGCC_MATCH_STRING:Mnewer}
 DELETE_INSTALLED_LIBGCC=       yes

Index: pkgsrc/lang/gcc14/patches/patch-gcc_config_aarch64_aarch64-tune.md
diff -u pkgsrc/lang/gcc14/patches/patch-gcc_config_aarch64_aarch64-tune.md:1.2 pkgsrc/lang/gcc14/patches/patch-gcc_config_aarch64_aarch64-tune.md:1.3
--- pkgsrc/lang/gcc14/patches/patch-gcc_config_aarch64_aarch64-tune.md:1.2      Sun Jun  8 07:37:45 2025
+++ pkgsrc/lang/gcc14/patches/patch-gcc_config_aarch64_aarch64-tune.md  Fri Jun 20 07:05:18 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-gcc_config_aarch64_aarch64-tune.md,v 1.2 2025/06/08 07:37:45 wiz Exp $
+$NetBSD: patch-gcc_config_aarch64_aarch64-tune.md,v 1.3 2025/06/20 07:05:18 adam Exp $
 
 Support Darwin/aarch64, from https://github.com/Homebrew/formula-patches.
 
@@ -9,5 +9,5 @@ Support Darwin/aarch64, from https://git
  ;; Generated automatically by gentune.sh from aarch64-cores.def
  (define_attr "tune"
 -      
"cortexa34,cortexa35,cortexa53,cortexa57,cortexa72,cortexa73,thunderx,thunderxt88p1,thunderxt88,octeontx,octeontxt81,octeontxt83,thunderxt81,thunderxt83,ampere1,ampere1a,ampere1b,emag,xgene1,falkor,qdf24xx,exynosm1,phecda,thunderx2t99p1,vulcan,thunderx2t99,cortexa55,cortexa75,cortexa76,cortexa76ae,cortexa77,cortexa78,cortexa78ae,cortexa78c,cortexa65,cortexa65ae,cortexx1,cortexx1c,neoversen1,ares,neoversee1,octeontx2,octeontx2t98,octeontx2t96,octeontx2t93,octeontx2f95,octeontx2f95n,octeontx2f95mm,a64fx,fujitsu_monaka,tsv110,thunderx3t110,neoversev1,zeus,neoverse512tvb,saphira,cortexa57cortexa53,cortexa72cortexa53,cortexa73cortexa35,cortexa73cortexa53,cortexa75cortexa55,cortexa76cortexa55,cortexr82,cortexa510,cortexa520,cortexa710,cortexa715,cortexa720,cortexa725,cortexx2,cortexx3,cortexx4,cortexx925,neoversen2,cobalt100,neoversen3,neoversev2,grace,neoversev3,neoversev3ae,demeter,generic,generic_armv8_a,generic_armv9_a"
-+      
"cortexa34,cortexa35,cortexa53,cortexa57,cortexa72,cortexa73,thunderx,thunderxt88p1,thunderxt88,octeontx,octeontxt81,octeontxt83,thunderxt81,thunderxt83,ampere1,ampere1a,ampere1b,emag,xgene1,falkor,qdf24xx,exynosm1,phecda,thunderx2t99p1,vulcan,thunderx2t99,cortexa55,cortexa75,cortexa76,cortexa76ae,cortexa77,cortexa78,cortexa78ae,cortexa78c,cortexa65,cortexa65ae,cortexx1,cortexx1c,neoversen1,ares,neoversee1,octeontx2,octeontx2t98,octeontx2t96,octeontx2t93,octeontx2f95,octeontx2f95n,octeontx2f95mm,a64fx,tsv110,thunderx3t110,neoversev1,zeus,neoverse512tvb,saphira,cortexa57cortexa53,cortexa72cortexa53,cortexa73cortexa35,cortexa73cortexa53,cortexa75cortexa55,cortexa76cortexa55,cortexr82,applea12,applem1,applem2,applem3,cortexa510,cortexa520,cortexa710,cortexa715,cortexa720,cortexx2,cortexx3,cortexx4,neoversen2,cobalt100,neoversev2,grace,demeter,generic,generic_armv8_a,generic_armv9_a"
++      
"cortexa34,cortexa35,cortexa53,cortexa57,cortexa72,cortexa73,thunderx,thunderxt88p1,thunderxt88,octeontx,octeontxt81,octeontxt83,thunderxt81,thunderxt83,ampere1,ampere1a,ampere1b,emag,xgene1,falkor,qdf24xx,exynosm1,phecda,thunderx2t99p1,vulcan,thunderx2t99,cortexa55,cortexa75,cortexa76,cortexa76ae,cortexa77,cortexa78,cortexa78ae,cortexa78c,cortexa65,cortexa65ae,cortexx1,cortexx1c,neoversen1,ares,neoversee1,octeontx2,octeontx2t98,octeontx2t96,octeontx2t93,octeontx2f95,octeontx2f95n,octeontx2f95mm,a64fx,fujitsu_monaka,tsv110,thunderx3t110,neoversev1,zeus,neoverse512tvb,saphira,cortexa57cortexa53,cortexa72cortexa53,cortexa73cortexa35,cortexa73cortexa53,cortexa75cortexa55,cortexa76cortexa55,cortexr82,applea12,applem1,applem2,applem3,cortexa510,cortexa520,cortexa710,cortexa715,cortexa720,cortexa725,cortexx2,cortexx3,cortexx4,cortexx925,neoversen2,cobalt100,neoversen3,neoversev2,grace,neoversev3,neoversev3ae,demeter,generic,generic_armv8_a,generic_armv9_a"
        (const (symbol_ref "((enum attr_tune) aarch64_tune)")))

Added files:

Index: pkgsrc/lang/gcc14/patches/patch-zlib_zutil.h
diff -u /dev/null pkgsrc/lang/gcc14/patches/patch-zlib_zutil.h:1.1
--- /dev/null   Fri Jun 20 07:05:19 2025
+++ pkgsrc/lang/gcc14/patches/patch-zlib_zutil.h        Fri Jun 20 07:05:18 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-zlib_zutil.h,v 1.1 2025/06/20 07:05:18 adam Exp $
+
+Fix build with Xcode 16.3.
+https://www.mail-archive.com/gcc-bugs%gcc.gnu.org@localhost/msg860049.html
+
+--- zlib/zutil.h.orig  2025-06-20 06:34:52.537143884 +0000
++++ zlib/zutil.h
+@@ -130,7 +130,7 @@ extern z_const char * const z_errmsg[10]
+ #  endif
+ #endif
+ 
+-#if defined(MACOS) || defined(TARGET_OS_MAC)
++#if defined(MACOS)
+ #  define OS_CODE  7
+ #  ifndef Z_SOLO
+ #    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os