CVS commit: pkgsrc/cross/i586-pc-msdosdjgpp-gcc

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sat Aug  2 19:00:21 UTC 2025

Modified Files:
        pkgsrc/cross/i586-pc-msdosdjgpp-gcc: distinfo
Added Files:
        pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches: patch-gcc_system.h
            patch-libcc1_libcc1plugin.cc patch-libcc1_libcp1plugin.cc
            patch-zlib_zutil.c

Log Message:
Fix building cross/i586-pc-msdosdjgpp-gcc on macOS 15


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/cross/i586-pc-msdosdjgpp-gcc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-gcc_system.h \
    pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-libcc1_libcc1plugin.cc \
    pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-libcc1_libcp1plugin.cc \
    pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-zlib_zutil.c

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

Modified files:

Index: pkgsrc/cross/i586-pc-msdosdjgpp-gcc/distinfo
diff -u pkgsrc/cross/i586-pc-msdosdjgpp-gcc/distinfo:1.3 pkgsrc/cross/i586-pc-msdosdjgpp-gcc/distinfo:1.4
--- pkgsrc/cross/i586-pc-msdosdjgpp-gcc/distinfo:1.3    Wed Mar 27 14:38:33 2024
+++ pkgsrc/cross/i586-pc-msdosdjgpp-gcc/distinfo        Sat Aug  2 19:00:21 2025
@@ -1,12 +1,16 @@
-$NetBSD: distinfo,v 1.3 2024/03/27 14:38:33 js Exp $
+$NetBSD: distinfo,v 1.4 2025/08/02 19:00:21 js Exp $
 
 BLAKE2s (gcc-13.2.0.tar.xz) = 89847ac474d00cde32fbcae20154f8aedff9c66158faf95ad7a78cc9a190d4c4
 SHA512 (gcc-13.2.0.tar.xz) = d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2
 Size (gcc-13.2.0.tar.xz) = 87858592 bytes
 SHA1 (patch-gcc_configure) = 380bc31209ca1c933293f8a89eaf802545743c7e
 SHA1 (patch-gcc_plugin.c) = ea04eaa4c57741ddcde393607a47bdb2e8987067
+SHA1 (patch-gcc_system.h) = 3a1b006c85c950045db5b920295f640d72c41199
 SHA1 (patch-libcc1_configure) = 76d81fdf07c2b05a9b7bca6f3800f2d5150b1fcf
+SHA1 (patch-libcc1_libcc1plugin.cc) = 741a9a090bf15a1a613b790d99a2156a31b798f1
+SHA1 (patch-libcc1_libcp1plugin.cc) = 03e64f0a8f6cf0e588071bec323598773cc7cd3c
 SHA1 (patch-libiberty_fibheap.c) = 8ecf7bd1db71c007ec541060de1db9d460f5a261
 SHA1 (patch-libiberty_filedescriptor.c) = 7ebdb028e3963ecdf7deabd5ff1516e97abd87aa
 SHA1 (patch-libiberty_pex-unix.c) = a49380e66f397055fb1ec3ee72847a237b973159
 SHA1 (patch-libstdc++-v3_libsupc++_unwind-cxx.h) = 8ee47c2b3fe3df43b6f5d3c2928ece2e144b5fb5
+SHA1 (patch-zlib_zutil.c) = 33a75b615f4d43c628450f8f3743a00a1a050c3e

Added files:

Index: pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-gcc_system.h
diff -u /dev/null pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-gcc_system.h:1.1
--- /dev/null   Sat Aug  2 19:00:21 2025
+++ pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-gcc_system.h      Sat Aug  2 19:00:21 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-gcc_system.h,v 1.1 2025/08/02 19:00:21 js Exp $
+
+--- gcc/system.h.orig  2025-08-02 15:58:31.986157456 +0000
++++ gcc/system.h
+@@ -203,11 +203,6 @@ extern int fprintf_unlocked (FILE *, con
+ #endif
+ #endif
+ 
+-/* There are an extraordinary number of issues with <ctype.h>.
+-   The last straw is that it varies with the locale.  Use libiberty's
+-   replacement instead.  */
+-#include "safe-ctype.h"
+-
+ #include <sys/types.h>
+ 
+ #include <errno.h>
+@@ -245,6 +240,11 @@ extern int errno;
+ # include <type_traits>
+ #endif
+ 
++/* There are an extraordinary number of issues with <ctype.h>.
++   The last straw is that it varies with the locale.  Use libiberty's
++   replacement instead.  */
++#include "safe-ctype.h"
++
+ /* Some of glibc's string inlines cause warnings.  Plus we'd rather
+    rely on (and therefore test) GCC's string builtins.  */
+ #define __NO_STRING_INLINES
Index: pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-libcc1_libcc1plugin.cc
diff -u /dev/null pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-libcc1_libcc1plugin.cc:1.1
--- /dev/null   Sat Aug  2 19:00:21 2025
+++ pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-libcc1_libcc1plugin.cc    Sat Aug  2 19:00:21 2025
@@ -0,0 +1,12 @@
+$NetBSD: patch-libcc1_libcc1plugin.cc,v 1.1 2025/08/02 19:00:21 js Exp $
+
+--- libcc1/libcc1plugin.cc.orig        2025-08-02 18:43:08.459850877 +0000
++++ libcc1/libcc1plugin.cc
+@@ -32,6 +32,7 @@
+ #undef PACKAGE_VERSION
+ 
+ #define INCLUDE_MEMORY
++#define INCLUDE_VECTOR
+ #include "gcc-plugin.h"
+ #include "system.h"
+ #include "coretypes.h"
Index: pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-libcc1_libcp1plugin.cc
diff -u /dev/null pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-libcc1_libcp1plugin.cc:1.1
--- /dev/null   Sat Aug  2 19:00:21 2025
+++ pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-libcc1_libcp1plugin.cc    Sat Aug  2 19:00:21 2025
@@ -0,0 +1,12 @@
+$NetBSD: patch-libcc1_libcp1plugin.cc,v 1.1 2025/08/02 19:00:21 js Exp $
+
+--- libcc1/libcp1plugin.cc.orig        2025-08-02 18:51:37.619890173 +0000
++++ libcc1/libcp1plugin.cc
+@@ -33,6 +33,7 @@
+ #undef PACKAGE_VERSION
+ 
+ #define INCLUDE_MEMORY
++#define INCLUDE_VECTOR
+ #include "gcc-plugin.h"
+ #include "system.h"
+ #include "coretypes.h"
Index: pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-zlib_zutil.c
diff -u /dev/null pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-zlib_zutil.c:1.1
--- /dev/null   Sat Aug  2 19:00:21 2025
+++ pkgsrc/cross/i586-pc-msdosdjgpp-gcc/patches/patch-zlib_zutil.c      Sat Aug  2 19:00:21 2025
@@ -0,0 +1,11 @@
+$NetBSD: patch-zlib_zutil.c,v 1.1 2025/08/02 19:00:21 js Exp $
+
+Fix building on macOS 15.
+
+--- zlib/zutil.c.orig  2025-04-20 20:10:32.611766921 +0000
++++ zlib/zutil.c
+@@ -7,2 +7,4 @@
+ 
++#include <stdio.h>
++
+ #include "zutil.h"