CVS commit: pkgsrc/lang

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jun 28 17:55:10 UTC 2024

Modified Files:
        pkgsrc/lang/gcc12: Makefile Makefile.common distinfo version.mk
        pkgsrc/lang/gcc12-libs: Makefile
        pkgsrc/lang/gcc12/patches: patch-libstdc++-v3_libsupc++_new__opa.cc

Log Message:
gcc12*: update to 12.4.0

12.4 is a bug fix release, with over 80 bug reports fixed, see
https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=12.4


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/gcc12/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gcc12/Makefile.common \
    pkgsrc/lang/gcc12/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc12/version.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/gcc12-libs/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/gcc12/patches/patch-libstdc++-v3_libsupc++_new__opa.cc

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
diff -u pkgsrc/lang/gcc12/Makefile:1.9 pkgsrc/lang/gcc12/Makefile:1.10
--- pkgsrc/lang/gcc12/Makefile:1.9      Wed May 15 12:22:17 2024
+++ pkgsrc/lang/gcc12/Makefile  Fri Jun 28 17:55:09 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2024/05/15 12:22:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2024/06/28 17:55:09 wiz Exp $
 
 PKGNAME=       ${GCC_PKGNAME}-${GCC12_DIST_VERSION}
-PKGREVISION=   1
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc12-libs needs to be bumped to be at least 1 more than the
 ## PKGREVISION of this package!

Index: pkgsrc/lang/gcc12/Makefile.common
diff -u pkgsrc/lang/gcc12/Makefile.common:1.6 pkgsrc/lang/gcc12/Makefile.common:1.7
--- pkgsrc/lang/gcc12/Makefile.common:1.6       Tue Aug 29 09:48:46 2023
+++ pkgsrc/lang/gcc12/Makefile.common   Fri Jun 28 17:55:09 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2023/08/29 09:48:46 nia Exp $
+# $NetBSD: Makefile.common,v 1.7 2024/06/28 17:55:09 wiz Exp $
 # used by lang/gcc12-libjit/Makefile
 
 GCC_PKGNAME=           gcc12
@@ -55,13 +55,14 @@ CHECK_PORTABILITY_SKIP+=    gcc/configure.o
 
 .include "options.mk"
 
-.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
+# 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
 
 ## For graphite support.
 .if !empty(PKG_OPTIONS:Mgcc-graphite)
Index: pkgsrc/lang/gcc12/distinfo
diff -u pkgsrc/lang/gcc12/distinfo:1.6 pkgsrc/lang/gcc12/distinfo:1.7
--- pkgsrc/lang/gcc12/distinfo:1.6      Wed May 15 12:22:17 2024
+++ pkgsrc/lang/gcc12/distinfo  Fri Jun 28 17:55:09 2024
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.6 2024/05/15 12:22:17 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2024/06/28 17:55:09 wiz Exp $
 
-BLAKE2s (gcc-12.3.0.diff) = 0ec7a208da1a1297fb09b7b8cd50855d1fd7cefacc02610cd43525dee2d8b554
-SHA512 (gcc-12.3.0.diff) = 21f9e9f1e9f59385876b1ffdab70fdd4d72d2a6cbbe5e9f68fafa0001d1daca25c6a825210fabd96f5a39a14d6649539b52d789427d64c7a050c3c10525ff054
-Size (gcc-12.3.0.diff) = 498388 bytes
-BLAKE2s (gcc-12.3.0.tar.xz) = 84d193401e32e82a0aa61bbfb4ddab2ed2e582b74502139dceb8173ea422f098
-SHA512 (gcc-12.3.0.tar.xz) = 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204
-Size (gcc-12.3.0.tar.xz) = 85491976 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
@@ -30,4 +27,4 @@ SHA1 (patch-libgcc_crtstuff.c) = a16d465
 SHA1 (patch-libgfortran_io_io.h) = d44676239a7f45e42054d24bd5224f43c20055c0
 SHA1 (patch-libquadmath_printf_quadmath-printf.c) = 78e09f1e6d61ee57cee83275093cf46b2335d204
 SHA1 (patch-libquadmath_strtod_strtod__l.c) = 6142c10d34174174cce7f06c37eab04dc431b2dc
-SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = 4183b00a5ee6e61524da4755c825a0c08fd01ed6
+SHA1 (patch-libstdc++-v3_libsupc++_new__opa.cc) = c8169d28f25c57ba89ffe8c9f897313bb8644382

Index: pkgsrc/lang/gcc12/version.mk
diff -u pkgsrc/lang/gcc12/version.mk:1.3 pkgsrc/lang/gcc12/version.mk:1.4
--- pkgsrc/lang/gcc12/version.mk:1.3    Sat Jul  1 10:53:11 2023
+++ pkgsrc/lang/gcc12/version.mk        Fri Jun 28 17:55:09 2024
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.3 2023/07/01 10:53:11 wiz Exp $
+# $NetBSD: version.mk,v 1.4 2024/06/28 17:55:09 wiz Exp $
 
-GCC12_DIST_VERSION:=   12.3.0
+GCC12_DIST_VERSION:=   12.4.0

Index: pkgsrc/lang/gcc12-libs/Makefile
diff -u pkgsrc/lang/gcc12-libs/Makefile:1.5 pkgsrc/lang/gcc12-libs/Makefile:1.6
--- pkgsrc/lang/gcc12-libs/Makefile:1.5 Wed May 15 12:23:08 2024
+++ pkgsrc/lang/gcc12-libs/Makefile     Fri Jun 28 17:55:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2024/05/15 12:23:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2024/06/28 17:55:10 wiz Exp $
 
 GCC_PKGNAME=   gcc12
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC12_DIS
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc12 package so that with the dependence pattern
 ## '{gcc12,gcc12-libs}>=12.1.*' pkg_add will choose gcc12-libs over gcc12.
-PKGREVISION=   2
+PKGREVISION=   1
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty

Index: pkgsrc/lang/gcc12/patches/patch-libstdc++-v3_libsupc++_new__opa.cc
diff -u pkgsrc/lang/gcc12/patches/patch-libstdc++-v3_libsupc++_new__opa.cc:1.1 pkgsrc/lang/gcc12/patches/patch-libstdc++-v3_libsupc++_new__opa.cc:1.2
--- pkgsrc/lang/gcc12/patches/patch-libstdc++-v3_libsupc++_new__opa.cc:1.1      Thu Jun 16 15:43:55 2022
+++ pkgsrc/lang/gcc12/patches/patch-libstdc++-v3_libsupc++_new__opa.cc  Fri Jun 28 17:55:10 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-libstdc++-v3_libsupc++_new__opa.cc,v 1.1 2022/06/16 15:43:55 adam Exp $
+$NetBSD: patch-libstdc++-v3_libsupc++_new__opa.cc,v 1.2 2024/06/28 17:55:10 wiz Exp $
 
 Ensure we can find SunOS std::aligned_alloc if using it.
 
---- libstdc++-v3/libsupc++/new_opa.cc.orig     2020-03-04 08:30:03.000000000 +0000
+--- libstdc++-v3/libsupc++/new_opa.cc.orig     2024-06-20 08:08:10.000000000 +0000
 +++ libstdc++-v3/libsupc++/new_opa.cc
-@@ -57,6 +57,10 @@ extern "C"
+@@ -62,6 +62,10 @@ extern "C"
  }
  #endif
  
@@ -13,5 +13,5 @@ Ensure we can find SunOS std::aligned_al
 +#endif
 +
  namespace __gnu_cxx {
- #if _GLIBCXX_HAVE_ALIGNED_ALLOC
- using ::aligned_alloc;
+ // Prefer posix_memalign if available, because it's older than aligned_alloc
+ // and so more likely to be provided by replacement malloc libraries that