CVS commit: pkgsrc/cross/ppc-morphos-gcc-11

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

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Apr 20 20:26:08 UTC 2025

Modified Files:
        pkgsrc/cross/ppc-morphos-gcc-11: Makefile distinfo
Added Files:
        pkgsrc/cross/ppc-morphos-gcc-11/patches: patch-zlib_zutil.c

Log Message:
Progress towards making cross/ppc-morphos-gcc-11 compile on macOS 15

Still not working, but this gets a lot farther. Now stuck on a hard to debug
interaction between system template headers and macros.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/cross/ppc-morphos-gcc-11/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/cross/ppc-morphos-gcc-11/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cross/ppc-morphos-gcc-11/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/ppc-morphos-gcc-11/Makefile
diff -u pkgsrc/cross/ppc-morphos-gcc-11/Makefile:1.6 pkgsrc/cross/ppc-morphos-gcc-11/Makefile:1.7
--- pkgsrc/cross/ppc-morphos-gcc-11/Makefile:1.6        Wed Mar 27 23:26:29 2024
+++ pkgsrc/cross/ppc-morphos-gcc-11/Makefile    Sun Apr 20 20:26:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2024/03/27 23:26:29 js Exp $
+# $NetBSD: Makefile,v 1.7 2025/04/20 20:26:08 js Exp $
 
 DISTNAME=      sdk-source-20230510
 PKGNAME=       ppc-morphos-gcc-11-11.3.0
@@ -18,7 +18,6 @@ WRKSRC=                       ${WRKDIR}/sdk-source/gcc11/gcc
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            xzcat gtar patch autoconf gsed gmake perl makeinfo
-TOOL_DEPENDS+=         patch-[0-9]*:../../devel/patch
 
 OBJDIR=                        ../build
 CONFIGURE_DIRS=                ${OBJDIR}
@@ -50,22 +49,25 @@ post-extract:
                ${XZCAT} gcc-${PKGVERSION_NOREV}.tar.xz | ${GTAR} xf -
 
 pre-patch:
-       ${RUN} cd ${WRKSRC} && ${PREFIX}/bin/gpatch -p1 <../gcc-11-morphos.diff
-       ${RUN} cd ${WRKSRC} && ${PREFIX}/bin/gpatch -p0 <../fpic.diff
-       ${RUN} cd ${WRKSRC} && ${PREFIX}/bin/gpatch -p1 <../fix-genericize_if_stmt-ice.diff
-       ${RUN} cd ${WRKSRC} && ${PREFIX}/bin/gpatch -p1 <../morphos-std-filesystem-path.diff
-       ${RUN} cd ${WRKSRC} && ${PREFIX}/bin/gpatch -p1 <../fix-fenv-for-crossbuild.diff
        # The diff for libstdc++-v3/configure is strangely large for the
        # minimal changes that are there to the .ac file *and* is broken (it
        # contains misordered hunks). Better to throw it away and regenerate it
        # (regenerated in post-patch).
-       ${RUN} rm ${WRKSRC}/libstdc++-v3/configure
+       ${RUN} cd ${WRKSRC} && ${PREFIX}/bin/gsed -i '5471,22839d' ../gcc-11-morphos.diff
+       # Out of memory with gpatch on Darwin, so use nbpatch (which works
+       # after dropping the broken part above).
+       ${RUN} cd ${WRKSRC} && ${PATCH} -p1 <../gcc-11-morphos.diff
+       ${RUN} cd ${WRKSRC} && ${PATCH} -p0 <../fpic.diff
+       ${RUN} cd ${WRKSRC} && ${PATCH} -p1 <../fix-genericize_if_stmt-ice.diff
+       ${RUN} cd ${WRKSRC} && ${PATCH} -p1 <../morphos-std-filesystem-path.diff
+       ${RUN} cd ${WRKSRC} && ${PATCH} -p1 <../fix-fenv-for-crossbuild.diff
 
 post-patch:
        # Change /gg to ${PREFIX}/gg
        ${RUN} cd ${WRKSRC} && \
-               gsed -i 's,/gg/,${PREFIX}/gg/,g' gcc/config/rs6000/morphos.h && \
-               gsed -i 's,/gg$$,${PREFIX}/gg,g' gcc/config.host
+               ${PREFIX}/bin/gsed -i 's,/gg/,${PREFIX}/gg/,g' \
+                       gcc/config/rs6000/morphos.h && \
+               ${PREFIX}/bin/gsed -i 's,/gg$$,${PREFIX}/gg,g' gcc/config.host
        ${RUN} cd ${WRKSRC}/libcc1 && autoreconf
        ${RUN} cd ${WRKSRC}/libstdc++-v3 && autoreconf
        ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}

Index: pkgsrc/cross/ppc-morphos-gcc-11/distinfo
diff -u pkgsrc/cross/ppc-morphos-gcc-11/distinfo:1.4 pkgsrc/cross/ppc-morphos-gcc-11/distinfo:1.5
--- pkgsrc/cross/ppc-morphos-gcc-11/distinfo:1.4        Wed Mar 27 23:26:29 2024
+++ pkgsrc/cross/ppc-morphos-gcc-11/distinfo    Sun Apr 20 20:26:08 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2024/03/27 23:26:29 js Exp $
+$NetBSD: distinfo,v 1.5 2025/04/20 20:26:08 js Exp $
 
 BLAKE2s (sdk-source-20230510.tar.xz) = 777febe845ddbf50cbaec55c2d198085996a5064bc3c4128f44dfe79355d765e
 SHA512 (sdk-source-20230510.tar.xz) = badf3e678d514713ece14779dcce5fe78f3a849c73718e05b3317c1c766fb9879368c8fd58f9441c905023a660e893cf0eec405d2c133e4c6d11fe39acc50418
@@ -13,3 +13,4 @@ SHA1 (patch-libiberty_simple-object-mach
 SHA1 (patch-libstdc++-v3_configure.ac) = d436423f31b5b9b977bfa27078d160ced4f3ed94
 SHA1 (patch-libstdc++-v3_crossconfig.m4) = 0d0d20f9a1444bd77520decd275ac22d2a6e4890
 SHA1 (patch-libstdc++-v3_libsupc++_unwind-cxx.h) = 0234e780171554bf60858b884ab1181cad36f8b2
+SHA1 (patch-zlib_zutil.c) = 33a75b615f4d43c628450f8f3743a00a1a050c3e

Added files:

Index: pkgsrc/cross/ppc-morphos-gcc-11/patches/patch-zlib_zutil.c
diff -u /dev/null pkgsrc/cross/ppc-morphos-gcc-11/patches/patch-zlib_zutil.c:1.1
--- /dev/null   Sun Apr 20 20:26:08 2025
+++ pkgsrc/cross/ppc-morphos-gcc-11/patches/patch-zlib_zutil.c  Sun Apr 20 20:26:08 2025
@@ -0,0 +1,11 @@
+$NetBSD: patch-zlib_zutil.c,v 1.1 2025/04/20 20:26:08 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"