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

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/cross/ppc-morphos-gcc-10
From: "Jonathan Schleifer" <js%netbsd.org@localhost>
Date: Thu, 24 Apr 2025 02:48:56 +0000

Module Name:    pkgsrc
Committed By:   js
Date:           Thu Apr 24 02:48:56 UTC 2025

Modified Files:
        pkgsrc/cross/ppc-morphos-gcc-10: Makefile PLIST distinfo
        pkgsrc/cross/ppc-morphos-gcc-10/patches:
            patch-gcc_config_rs6000_morphos.h
Added Files:
        pkgsrc/cross/ppc-morphos-gcc-10/patches: patch-include_safe-ctype.h
            patch-zlib_zutil.c

Log Message:
Update cross/ppc-morphos-gcc-10 to 10.4.0


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/cross/ppc-morphos-gcc-10/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/cross/ppc-morphos-gcc-10/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/cross/ppc-morphos-gcc-10/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/cross/ppc-morphos-gcc-10/patches/patch-gcc_config_rs6000_morphos.h
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cross/ppc-morphos-gcc-10/patches/patch-include_safe-ctype.h \
    pkgsrc/cross/ppc-morphos-gcc-10/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-10/Makefile
diff -u pkgsrc/cross/ppc-morphos-gcc-10/Makefile:1.5 pkgsrc/cross/ppc-morphos-gcc-10/Makefile:1.6
--- pkgsrc/cross/ppc-morphos-gcc-10/Makefile:1.5        Wed Aug 30 21:46:33 2023
+++ pkgsrc/cross/ppc-morphos-gcc-10/Makefile    Thu Apr 24 02:48:56 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2023/08/30 21:46:33 js Exp $
+# $NetBSD: Makefile,v 1.6 2025/04/24 02:48:56 js Exp $
 
-DISTNAME=      sdk-source-20210211
-PKGNAME=       ppc-morphos-gcc-10-10.2.0
-PKGREVISION=   1
+DISTNAME=      sdk-source-20230510
+PKGNAME=       ppc-morphos-gcc-10-10.4.0
 CATEGORIES=    cross
 MASTER_SITES=  https://morphos-team.net/files/src/sdk/
 EXTRACT_SUFX=  .tar.xz
@@ -61,8 +60,9 @@ pre-patch:
 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-10/PLIST
diff -u pkgsrc/cross/ppc-morphos-gcc-10/PLIST:1.1 pkgsrc/cross/ppc-morphos-gcc-10/PLIST:1.2
--- pkgsrc/cross/ppc-morphos-gcc-10/PLIST:1.1   Sun Jul 25 15:06:25 2021
+++ pkgsrc/cross/ppc-morphos-gcc-10/PLIST       Thu Apr 24 02:48:56 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/07/25 15:06:25 js Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/04/24 02:48:56 js Exp $
 gg/bin/ppc-morphos-c++-10
 gg/bin/ppc-morphos-cpp-10
 gg/bin/ppc-morphos-g++-10
@@ -83,7 +83,6 @@ gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/include/c++/bits/hashtable.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/include/c++/bits/hashtable_policy.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/include/c++/bits/indirect_array.h
-gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/include/c++/bits/int_limits.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/include/c++/bits/invoke.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/include/c++/bits/ios_base.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/include/c++/bits/istream.tcc
@@ -1130,6 +1129,7 @@ gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/gimplify-me.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/gimplify.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/glimits.h
+gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/gomp-constants.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/graph.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/graphds.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/graphite.h
@@ -1164,6 +1164,7 @@ gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/insn-attr-common.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/insn-attr.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/insn-codes.h
+gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/insn-config.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/insn-constants.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/insn-flags.h
 gg/lib/gcc-lib/ppc-morphos/${PKGVERSION}/plugin/include/insn-modes-inline.h

Index: pkgsrc/cross/ppc-morphos-gcc-10/distinfo
diff -u pkgsrc/cross/ppc-morphos-gcc-10/distinfo:1.4 pkgsrc/cross/ppc-morphos-gcc-10/distinfo:1.5
--- pkgsrc/cross/ppc-morphos-gcc-10/distinfo:1.4        Fri Apr 15 16:56:08 2022
+++ pkgsrc/cross/ppc-morphos-gcc-10/distinfo    Thu Apr 24 02:48:56 2025
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.4 2022/04/15 16:56:08 tnn Exp $
+$NetBSD: distinfo,v 1.5 2025/04/24 02:48:56 js Exp $
 
-BLAKE2s (sdk-source-20210211.tar.xz) = 2beb02bed78ad24be545f436bcfe0af2cfec716c3c7a8b4c2a5a6f98c20f597b
-SHA512 (sdk-source-20210211.tar.xz) = 7f4fcd370c2b57765ae81807ef66a54de4f44ef2bcc5659902e3097f7f834bfd29bc608e72c738c82b446d903c578f49f2fe7c0c22d62ef60a5cef8911944a33
-Size (sdk-source-20210211.tar.xz) = 565963672 bytes
+BLAKE2s (sdk-source-20230510.tar.xz) = 777febe845ddbf50cbaec55c2d198085996a5064bc3c4128f44dfe79355d765e
+SHA512 (sdk-source-20230510.tar.xz) = badf3e678d514713ece14779dcce5fe78f3a849c73718e05b3317c1c766fb9879368c8fd58f9441c905023a660e893cf0eec405d2c133e4c6d11fe39acc50418
+Size (sdk-source-20230510.tar.xz) = 588551012 bytes
 SHA1 (patch-config_override.m4) = 1ee0186b006a987dc57151a9d112654eabd24db9
 SHA1 (patch-gcc_config_host-darwin.c) = 62d75a4ce61a0ae42a756c9fd1476a329bb44600
-SHA1 (patch-gcc_config_rs6000_morphos.h) = c3702354f0dea476ba1516896e67b857dbfe7700
+SHA1 (patch-gcc_config_rs6000_morphos.h) = c788e480f3f510b61292f5b1ec5b84646b33ab93
+SHA1 (patch-include_safe-ctype.h) = 1bc66b5e78d928fab522b7b6875cf7709aaeb808
 SHA1 (patch-libcc1_configure.ac) = ca40be7af4a4ffc3a4fba1a0dbda76fcde1fa2d9
 SHA1 (patch-libstdc++-v3_configure.ac) = 4db5bf349ca5ca8315eb1b9baf3cadd5f463e8b4
 SHA1 (patch-libstdc++-v3_crossconfig.m4) = 0d0d20f9a1444bd77520decd275ac22d2a6e4890
 SHA1 (patch-libstdc++-v3_libsupc++_unwind-cxx.h) = 0234e780171554bf60858b884ab1181cad36f8b2
+SHA1 (patch-zlib_zutil.c) = 33a75b615f4d43c628450f8f3743a00a1a050c3e

Index: pkgsrc/cross/ppc-morphos-gcc-10/patches/patch-gcc_config_rs6000_morphos.h
diff -u pkgsrc/cross/ppc-morphos-gcc-10/patches/patch-gcc_config_rs6000_morphos.h:1.1 pkgsrc/cross/ppc-morphos-gcc-10/patches/patch-gcc_config_rs6000_morphos.h:1.2
--- pkgsrc/cross/ppc-morphos-gcc-10/patches/patch-gcc_config_rs6000_morphos.h:1.1       Sun Jul 25 15:06:25 2021
+++ pkgsrc/cross/ppc-morphos-gcc-10/patches/patch-gcc_config_rs6000_morphos.h   Thu Apr 24 02:48:56 2025
@@ -1,17 +1,17 @@
-$NetBSD: patch-gcc_config_rs6000_morphos.h,v 1.1 2021/07/25 15:06:25 js Exp $
+$NetBSD: patch-gcc_config_rs6000_morphos.h,v 1.2 2025/04/24 02:48:56 js Exp $
 
 Don't try to unconditionally pull in -latomic - it will make the bootstrap
 compiler require -latomic, which of course means we can never have a compiler
 to build libatomic.
 
---- gcc/config/rs6000/morphos.h.orig   2021-07-25 14:52:44.485678708 +0000
+--- gcc/config/rs6000/morphos.h.orig   2022-10-17 11:41:30.695278835 +0000
 +++ gcc/config/rs6000/morphos.h
 @@ -258,7 +258,7 @@ mclib=default|!mclib=*: %(endfile_morpho
  
  
  #undef LIB_SPEC
--#define LIB_SPEC "%{!nostdlib: -L/gg/lib -L/gg/usr/lib} --start-group -lc -labox -laboxstubs -lsavl -latomic %{mclib=libnix: -lauto} --end-group"
-+#define LIB_SPEC "%{!nostdlib: -L/gg/lib -L/gg/usr/lib} --start-group -lc -labox -laboxstubs -lsavl %{mclib=libnix: -lauto} --end-group"
+-#define LIB_SPEC "%{!nostdlib: -L/gg/lib -L/gg/usr/lib} --start-group -lc -labox -laboxstubs -lsavl -latomic %{mclib=libnix: -lauto} %{pthread:-lpthread} --end-group"
++#define LIB_SPEC "%{!nostdlib: -L/gg/lib -L/gg/usr/lib} --start-group -lc -labox -laboxstubs -lsavl %{mclib=libnix: -lauto} %{pthread:-lpthread} --end-group"
  
  #undef SUBTARGET_EXTRA_SPECS
  #define SUBTARGET_EXTRA_SPECS \

Added files:

Index: pkgsrc/cross/ppc-morphos-gcc-10/patches/patch-include_safe-ctype.h
diff -u /dev/null pkgsrc/cross/ppc-morphos-gcc-10/patches/patch-include_safe-ctype.h:1.1
--- /dev/null   Thu Apr 24 02:48:56 2025
+++ pkgsrc/cross/ppc-morphos-gcc-10/patches/patch-include_safe-ctype.h  Thu Apr 24 02:48:56 2025
@@ -0,0 +1,47 @@
+$NetBSD: patch-include_safe-ctype.h,v 1.1 2025/04/24 02:48:56 js Exp $
+
+Don't define functions from ctype.h to garbage, as it breaks the C++ headers on
+Darwin.
+
+--- include/safe-ctype.h.orig  2025-04-21 22:37:25.719755271 +0000
++++ include/safe-ctype.h
+@@ -112,39 +112,4 @@ extern const unsigned char  _sch_tolower
+ #define TOUPPER(c) _sch_toupper[(c) & 0xff]
+ #define TOLOWER(c) _sch_tolower[(c) & 0xff]
+ 
+-/* Prevent the users of safe-ctype.h from accidently using the routines
+-   from ctype.h.  Initially, the approach was to produce an error when
+-   detecting that ctype.h has been included.  But this was causing
+-   trouble as ctype.h might get indirectly included as a result of
+-   including another system header (for instance gnulib's stdint.h).
+-   So we include ctype.h here and then immediately redefine its macros.  */
+-
+-#include <ctype.h>
+-#undef isalpha
+-#define isalpha(c) do_not_use_isalpha_with_safe_ctype
+-#undef isalnum
+-#define isalnum(c) do_not_use_isalnum_with_safe_ctype
+-#undef iscntrl
+-#define iscntrl(c) do_not_use_iscntrl_with_safe_ctype
+-#undef isdigit
+-#define isdigit(c) do_not_use_isdigit_with_safe_ctype
+-#undef isgraph
+-#define isgraph(c) do_not_use_isgraph_with_safe_ctype
+-#undef islower
+-#define islower(c) do_not_use_islower_with_safe_ctype
+-#undef isprint
+-#define isprint(c) do_not_use_isprint_with_safe_ctype
+-#undef ispunct
+-#define ispunct(c) do_not_use_ispunct_with_safe_ctype
+-#undef isspace
+-#define isspace(c) do_not_use_isspace_with_safe_ctype
+-#undef isupper
+-#define isupper(c) do_not_use_isupper_with_safe_ctype
+-#undef isxdigit
+-#define isxdigit(c) do_not_use_isxdigit_with_safe_ctype
+-#undef toupper
+-#define toupper(c) do_not_use_toupper_with_safe_ctype
+-#undef tolower
+-#define tolower(c) do_not_use_tolower_with_safe_ctype
+-
+ #endif /* SAFE_CTYPE_H */
Index: pkgsrc/cross/ppc-morphos-gcc-10/patches/patch-zlib_zutil.c
diff -u /dev/null pkgsrc/cross/ppc-morphos-gcc-10/patches/patch-zlib_zutil.c:1.1
--- /dev/null   Thu Apr 24 02:48:56 2025
+++ pkgsrc/cross/ppc-morphos-gcc-10/patches/patch-zlib_zutil.c  Thu Apr 24 02:48:56 2025
@@ -0,0 +1,11 @@
+$NetBSD: patch-zlib_zutil.c,v 1.1 2025/04/24 02:48:56 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"

Prev by Date: CVS commit: pkgsrc/sysutils/u-boot
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/sysutils/u-boot
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index