CVS commit: pkgsrc/cross

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat May  3 16:19:25 UTC 2025

Modified Files:
        pkgsrc/cross/xtensa-esp-elf-binutils: distinfo
        pkgsrc/cross/xtensa-esp-elf-gcc: distinfo
Added Files:
        pkgsrc/cross/xtensa-esp-elf-binutils/patches: patch-zlib_zutil.c
        pkgsrc/cross/xtensa-esp-elf-gcc/patches: patch-zlib_zutil.c

Log Message:
cross/xtensa-esp-*: carry over macOS zlib fix from cross/ppc-morphos-*

Old GCC and binutils have bundled zlib that doesn't compile on macOS.
I'd switch to pkgsrc provided zlib but it has historically caused
rpath issues with GCC, so patch the bundled version for now.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cross/xtensa-esp-elf-binutils/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cross/xtensa-esp-elf-binutils/patches/patch-zlib_zutil.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cross/xtensa-esp-elf-gcc/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cross/xtensa-esp-elf-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/xtensa-esp-elf-binutils/distinfo
diff -u pkgsrc/cross/xtensa-esp-elf-binutils/distinfo:1.1 pkgsrc/cross/xtensa-esp-elf-binutils/distinfo:1.2
--- pkgsrc/cross/xtensa-esp-elf-binutils/distinfo:1.1   Mon Jul 22 20:01:50 2024
+++ pkgsrc/cross/xtensa-esp-elf-binutils/distinfo       Sat May  3 16:19:25 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2024/07/22 20:01:50 tnn Exp $
+$NetBSD: distinfo,v 1.2 2025/05/03 16:19:25 tnn Exp $
 
 BLAKE2s (crosstool-NG-esp-13.2.0_20240530-src.tar.xz) = 7cd662eceee9bd5ae1216fde1ddf3a7ea67a2607b727075ee65d9fe1429478a6
 SHA512 (crosstool-NG-esp-13.2.0_20240530-src.tar.xz) = 2d8235e9743d95804278d964887f48f1935e932f48b2a6467ee3e81028b2909c05ad825ee14bffeadbbfaab2d54badea78d986192000a1126b2ccb1d75bd9649
@@ -7,3 +7,4 @@ BLAKE2s (espressif-binutils-gdb-esp-2.41
 SHA512 (espressif-binutils-gdb-esp-2.41.0_20240305.tar.gz) = 610ea208e2ee15fce67de960e60a724ae4ab5d7c5c01e3fb3d62abfb4600771b195d82d0441fa6e9ca05752a8ddba37fa11923fc3745ead5a98d04147678b707
 Size (espressif-binutils-gdb-esp-2.41.0_20240305.tar.gz) = 65669754 bytes
 SHA1 (patch-bfd_xtensa-dynconfig.c) = 24ca1663c8d3236419bb43f93a744fca9704b46b
+SHA1 (patch-zlib_zutil.c) = e36f0298ebdfef1ff4b0a28ffc9e20bf8903b7df

Index: pkgsrc/cross/xtensa-esp-elf-gcc/distinfo
diff -u pkgsrc/cross/xtensa-esp-elf-gcc/distinfo:1.1 pkgsrc/cross/xtensa-esp-elf-gcc/distinfo:1.2
--- pkgsrc/cross/xtensa-esp-elf-gcc/distinfo:1.1        Mon Jul 22 20:01:50 2024
+++ pkgsrc/cross/xtensa-esp-elf-gcc/distinfo    Sat May  3 16:19:25 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2024/07/22 20:01:50 tnn Exp $
+$NetBSD: distinfo,v 1.2 2025/05/03 16:19:25 tnn Exp $
 
 BLAKE2s (crosstool-NG-esp-13.2.0_20240530-src.tar.xz) = 7cd662eceee9bd5ae1216fde1ddf3a7ea67a2607b727075ee65d9fe1429478a6
 SHA512 (crosstool-NG-esp-13.2.0_20240530-src.tar.xz) = 2d8235e9743d95804278d964887f48f1935e932f48b2a6467ee3e81028b2909c05ad825ee14bffeadbbfaab2d54badea78d986192000a1126b2ccb1d75bd9649
@@ -14,3 +14,4 @@ SHA1 (patch-gcc_system.h) = 9ef5369990b0
 SHA1 (patch-libgcc_libgcov.h) = ed9fd122c5b9786c8a3476b13892a1c0c803509d
 SHA1 (patch-newlib_libc_posix_collate.c) = 105aa07ba8de71eb1b3c4459303ceba26ed9dadc
 SHA1 (patch-newlib_libc_posix_regcomp.c) = 8f2e669b338f638c041992fc051d119f0ae21445
+SHA1 (patch-zlib_zutil.c) = ac4f09acca50d86637da7ff95f337ea78a5999ea

Added files:

Index: pkgsrc/cross/xtensa-esp-elf-binutils/patches/patch-zlib_zutil.c
diff -u /dev/null pkgsrc/cross/xtensa-esp-elf-binutils/patches/patch-zlib_zutil.c:1.1
--- /dev/null   Sat May  3 16:19:25 2025
+++ pkgsrc/cross/xtensa-esp-elf-binutils/patches/patch-zlib_zutil.c     Sat May  3 16:19:25 2025
@@ -0,0 +1,11 @@
+$NetBSD: patch-zlib_zutil.c,v 1.1 2025/05/03 16:19:25 tnn Exp $
+
+Fix building on macOS 15.
+
+--- zlib/zutil.c.orig  2025-05-03 16:07:20.137783431 +0000
++++ zlib/zutil.c
+@@ -7,2 +7,4 @@
+ 
++#include <stdio.h>
++
+ #include "zutil.h"

Index: pkgsrc/cross/xtensa-esp-elf-gcc/patches/patch-zlib_zutil.c
diff -u /dev/null pkgsrc/cross/xtensa-esp-elf-gcc/patches/patch-zlib_zutil.c:1.1
--- /dev/null   Sat May  3 16:19:25 2025
+++ pkgsrc/cross/xtensa-esp-elf-gcc/patches/patch-zlib_zutil.c  Sat May  3 16:19:25 2025
@@ -0,0 +1,11 @@
+$NetBSD: patch-zlib_zutil.c,v 1.1 2025/05/03 16:19:25 tnn Exp $
+
+Fix building on macOS 15.
+
+--- zlib/zutil.c.orig  2025-05-03 16:10:12.338440370 +0000
++++ zlib/zutil.c
+@@ -7,2 +7,4 @@
+ 
++#include <stdio.h>
++
+ #include "zutil.h"