CVS commit: pkgsrc/cross/arm-none-eabi-gcc

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Wed Feb 25 09:15:03 UTC 2026

Modified Files:
        pkgsrc/cross/arm-none-eabi-gcc: Makefile distinfo
        pkgsrc/cross/arm-none-eabi-gcc/patches: patch-libcc1_configure
            patch-libiberty_Makefile.in
Added Files:
        pkgsrc/cross/arm-none-eabi-gcc/patches: patch-zlib_zutil.h

Log Message:
arm-none-eabi-gcc: Fix PR pkg/59701

pkgsrc changes:
---------------
  * Remove fdopen #defines in zutil.h on macOS.
  * Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/cross/arm-none-eabi-gcc/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/cross/arm-none-eabi-gcc/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/cross/arm-none-eabi-gcc/patches/patch-libcc1_configure \
    pkgsrc/cross/arm-none-eabi-gcc/patches/patch-libiberty_Makefile.in
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cross/arm-none-eabi-gcc/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/cross/arm-none-eabi-gcc/Makefile
diff -u pkgsrc/cross/arm-none-eabi-gcc/Makefile:1.36 pkgsrc/cross/arm-none-eabi-gcc/Makefile:1.37
--- pkgsrc/cross/arm-none-eabi-gcc/Makefile:1.36        Thu Sep  4 23:06:24 2025
+++ pkgsrc/cross/arm-none-eabi-gcc/Makefile     Wed Feb 25 09:15:03 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2025/09/04 23:06:24 lloyd Exp $
+# $NetBSD: Makefile,v 1.37 2026/02/25 09:15:03 triaxx Exp $
 
 DISTNAME=              gcc-14.3.0
 PKGNAME=               cross-arm-none-eabi-${DISTNAME}
-#PKGREVISION=          1
+PKGREVISION=           1
 CATEGORIES=            cross
 NEWLIBVER=             4.5.0.20241231
 MASTER_SITES=          ${MASTER_SITE_GNU:=gcc/gcc-${PKGVERSION_NOREV}/}

Index: pkgsrc/cross/arm-none-eabi-gcc/distinfo
diff -u pkgsrc/cross/arm-none-eabi-gcc/distinfo:1.16 pkgsrc/cross/arm-none-eabi-gcc/distinfo:1.17
--- pkgsrc/cross/arm-none-eabi-gcc/distinfo:1.16        Thu Sep  4 23:06:24 2025
+++ pkgsrc/cross/arm-none-eabi-gcc/distinfo     Wed Feb 25 09:15:03 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2025/09/04 23:06:24 lloyd Exp $
+$NetBSD: distinfo,v 1.17 2026/02/25 09:15:03 triaxx Exp $
 
 BLAKE2s (gcc-14.3.0.tar.xz) = 70036c7d07767bba3476d19a6fd52f0b09dc05651c6cf5d136afe18ffa3b63a9
 SHA512 (gcc-14.3.0.tar.xz) = cb4e3259640721bbd275c723fe4df53d12f9b1673afb3db274c22c6aa457865dccf2d6ea20b4fd4c591f6152e6d4b87516c402015900f06ce9d43af66d3b7a93
@@ -7,6 +7,7 @@ BLAKE2s (newlib-4.5.0.20241231.tar.gz) =
 SHA512 (newlib-4.5.0.20241231.tar.gz) = d391ea3ac68ddb722909ef790f81ba4d6c35d9b2e0fcdb029f91a6c47db9ee94a686a2bdff211fb84025e1a317e257acfa59abda3fd2bc6609966798e1c604dc
 Size (newlib-4.5.0.20241231.tar.gz) = 9081514 bytes
 SHA1 (patch-gcc_config_arm_arm.h) = 2209c88f457bf8be72410f12ea899f8757ed0ada
-SHA1 (patch-libcc1_configure) = 0368733ddf79b109fcc7146b0baeb37ab31e634a
+SHA1 (patch-libcc1_configure) = aec9713e7d8cd0bb4af1e25282cc161a3375e926
 SHA1 (patch-libcc1_connection.cc) = 2acd56a6f62b29ed3f02eecb7bf103e4564a442c
-SHA1 (patch-libiberty_Makefile.in) = 7ea2578b5b77cb4adcd4afe3d63739efc68a1540
+SHA1 (patch-libiberty_Makefile.in) = 6b7c61efc45586040c414fb6c716209064dbb432
+SHA1 (patch-zlib_zutil.h) = fe698a26a16fb2a290c5658616d8a945f97f33d3

Index: pkgsrc/cross/arm-none-eabi-gcc/patches/patch-libcc1_configure
diff -u pkgsrc/cross/arm-none-eabi-gcc/patches/patch-libcc1_configure:1.1 pkgsrc/cross/arm-none-eabi-gcc/patches/patch-libcc1_configure:1.2
--- pkgsrc/cross/arm-none-eabi-gcc/patches/patch-libcc1_configure:1.1   Wed Oct 19 12:48:26 2016
+++ pkgsrc/cross/arm-none-eabi-gcc/patches/patch-libcc1_configure       Wed Feb 25 09:15:03 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-libcc1_configure,v 1.1 2016/10/19 12:48:26 ryoon Exp $
+$NetBSD: patch-libcc1_configure,v 1.2 2026/02/25 09:15:03 triaxx Exp $
 
 Disable multi-os install dir for libcc1
 
 --- libcc1/configure.orig      2014-11-21 16:49:17.000000000 +0000
 +++ libcc1/configure
-@@ -14366,9 +14366,6 @@ fi
+@@ -15046,9 +15046,6 @@ fi
  
  
  libsuffix=
Index: pkgsrc/cross/arm-none-eabi-gcc/patches/patch-libiberty_Makefile.in
diff -u pkgsrc/cross/arm-none-eabi-gcc/patches/patch-libiberty_Makefile.in:1.1 pkgsrc/cross/arm-none-eabi-gcc/patches/patch-libiberty_Makefile.in:1.2
--- pkgsrc/cross/arm-none-eabi-gcc/patches/patch-libiberty_Makefile.in:1.1      Wed Oct 19 12:48:26 2016
+++ pkgsrc/cross/arm-none-eabi-gcc/patches/patch-libiberty_Makefile.in  Wed Feb 25 09:15:03 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-libiberty_Makefile.in,v 1.1 2016/10/19 12:48:26 ryoon Exp $
+$NetBSD: patch-libiberty_Makefile.in,v 1.2 2026/02/25 09:15:03 triaxx Exp $
 
 --- libiberty/Makefile.in.orig 2014-12-24 16:22:51.000000000 +0000
 +++ libiberty/Makefile.in
-@@ -363,13 +363,12 @@ install-strip: install
+@@ -385,13 +385,12 @@ install-strip: install
  # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
  # default multilib, so we have to take CFLAGS into account as well,
  # since it will be passed the multilib flags.
@@ -20,7 +20,7 @@ $NetBSD: patch-libiberty_Makefile.in,v 1
                case "${target_header_dir}" in \
                  /*)    thd=${target_header_dir};; \
                  *)     thd=${includedir}/${target_header_dir};; \
-@@ -382,10 +381,10 @@ install_to_libdir: all
+@@ -404,10 +403,10 @@ install_to_libdir: all
        @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
  
  install_to_tooldir: all

Added files:

Index: pkgsrc/cross/arm-none-eabi-gcc/patches/patch-zlib_zutil.h
diff -u /dev/null pkgsrc/cross/arm-none-eabi-gcc/patches/patch-zlib_zutil.h:1.1
--- /dev/null   Wed Feb 25 09:15:03 2026
+++ pkgsrc/cross/arm-none-eabi-gcc/patches/patch-zlib_zutil.h   Wed Feb 25 09:15:03 2026
@@ -0,0 +1,26 @@
+$NetBSD: patch-zlib_zutil.h,v 1.1 2026/02/25 09:15:03 triaxx Exp $
+
+Remove fdopen #defines in zutil.h.
+https://github.com/madler/zlib/commit/4bd9a71
+
+--- zlib/zutil.h.orig  2026-02-25 07:27:51.430133695 +0000
++++ zlib/zutil.h
+@@ -130,17 +130,8 @@ 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
+-#      include <unix.h> /* for fdopen */
+-#    else
+-#      ifndef fdopen
+-#        define fdopen(fd,mode) NULL /* No fdopen() */
+-#      endif
+-#    endif
+-#  endif
+ #endif
+ 
+ #ifdef __acorn