CVS commit: pkgsrc/lang

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sat Nov  8 07:04:02 UTC 2025

Modified Files:
        pkgsrc/lang/gcc15: Makefile distinfo options.mk
        pkgsrc/lang/gcc15-libs: Makefile
Added Files:
        pkgsrc/lang/gcc15/patches: patch-configure patch-configure.ac
            patch-gcc_config_netbsd.h patch-libgcc_config.host
            patch-libgcc_enable-execute-stack-mprotect.c
            patch-libgcobol_configure.tgt

Log Message:
port gcobol to netbsd amd64 and arm64.

also fix the arm64 port - it wasn't including LSE and had link issues.

define DL_LIBRARY "" on netbsd, we don't have -ldl.

avoid a weird "unused" isn't ignored warning on arm64.

tested with a simple hello.cob:

            IDENTIFICATION DIVISION.
            PROGRAM-ID. HELLO.
            PROCEDURE DIVISION.
              DISPLAY 'hello cobol world'.
            STOP RUN.

bump pkg revision.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc15/Makefile \
    pkgsrc/lang/gcc15/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc15/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc15-libs/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gcc15/patches/patch-configure \
    pkgsrc/lang/gcc15/patches/patch-configure.ac \
    pkgsrc/lang/gcc15/patches/patch-gcc_config_netbsd.h \
    pkgsrc/lang/gcc15/patches/patch-libgcc_config.host \
    pkgsrc/lang/gcc15/patches/patch-libgcc_enable-execute-stack-mprotect.c \
    pkgsrc/lang/gcc15/patches/patch-libgcobol_configure.tgt

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

Modified files:

Index: pkgsrc/lang/gcc15/Makefile
diff -u pkgsrc/lang/gcc15/Makefile:1.3 pkgsrc/lang/gcc15/Makefile:1.4
--- pkgsrc/lang/gcc15/Makefile:1.3      Sat Aug  9 15:53:10 2025
+++ pkgsrc/lang/gcc15/Makefile  Sat Nov  8 07:04:02 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2025/08/09 15:53:10 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2025/11/08 07:04:02 mrg Exp $
 
 PKGNAME=       ${GCC_PKGNAME}-${GCC15_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc15-libs needs to be bumped to be at least 1 more than the
 ## PKGREVISION of this package!
-#PKGREVISION=  1
+PKGREVISION=   1
 COMMENT=       The GNU Compiler Collection (GCC) - 15.0 Release Series
 
 LANGS=         c
Index: pkgsrc/lang/gcc15/distinfo
diff -u pkgsrc/lang/gcc15/distinfo:1.3 pkgsrc/lang/gcc15/distinfo:1.4
--- pkgsrc/lang/gcc15/distinfo:1.3      Sat Aug  9 15:53:10 2025
+++ pkgsrc/lang/gcc15/distinfo  Sat Nov  8 07:04:02 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2025/08/09 15:53:10 wiz Exp $
+$NetBSD: distinfo,v 1.4 2025/11/08 07:04:02 mrg Exp $
 
 BLAKE2s (gcc-15.2.0.tar.xz) = ee9b2705b03ef8e6b5a41cf523dad26dcdaa8047be3743121b1673ce2fcc8832
 SHA512 (gcc-15.2.0.tar.xz) = 89047a2e07bd9da265b507b516ed3635adb17491c7f4f67cf090f0bd5b3fc7f2ee6e4cc4008beef7ca884b6b71dffe2bb652b21f01a702e17b468cca2d10b2de
@@ -6,6 +6,8 @@ Size (gcc-15.2.0.tar.xz) = 101056276 byt
 BLAKE2s (isl-0.24.tar.xz) = a3013b0d39b7fe68a1b3e15dc7e925b347d555348ee946a80f5319a76973cd61
 SHA512 (isl-0.24.tar.xz) = ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8
 Size (isl-0.24.tar.xz) = 1930956 bytes
+SHA1 (patch-configure) = 8e33eda65a5a5ba212ebab8c26ca4dc2e5ae0c51
+SHA1 (patch-configure.ac) = b72e07578678926dca9ce5b008bacbfcecb68cbb
 SHA1 (patch-gcc_Makefile.in) = a31ddc27f1092cfdf5ac896ca79c8590b5aceb47
 SHA1 (patch-gcc_config.gcc) = 65126c56f0cd9027f66b5f677773dfa9973b451c
 SHA1 (patch-gcc_config.host) = bf95dd21bfdf79d173e745fbd35c9bb99fdf4087
@@ -16,10 +18,14 @@ SHA1 (patch-gcc_config_arm_elf.h) = 5774
 SHA1 (patch-gcc_config_arm_netbsd-eabi.h) = 85eb89de6f2e64fac50251f06d7e4eab35903dae
 SHA1 (patch-gcc_config_arm_netbsd-elf.h) = 568f537d624199ef9f9f56088fe4fff7e946b2e2
 SHA1 (patch-gcc_config_i386_t-netbsd64) = 914b4d2fd65f5e46681aa2ea592d0bc75299f09a
+SHA1 (patch-gcc_config_netbsd.h) = ada05409eacb33bc1e7a659f3090f2f43551a35d
 SHA1 (patch-isl_configure) = a6295c509bdc82e8b54d7dec5252994532463091
 SHA1 (patch-libffi_configure) = 919bbe094e3ce547a0186eeaddb20a662595f79a
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 89e2dd6aaf2c1f75726f02362d8a8bf7178694ea
+SHA1 (patch-libgcc_config.host) = c9ea8bda0e6a1a8c4c39e4b8320a34b86e1da278
 SHA1 (patch-libgcc_crtstuff.c) = dd7808497b058bcac4aa8d91388d6a7685bb5e5c
+SHA1 (patch-libgcc_enable-execute-stack-mprotect.c) = 9cec951183f5092d14d7736f73f50523cdba7592
+SHA1 (patch-libgcobol_configure.tgt) = d5a0e35e03ff8c835cbcb6cf17725ae82fd727af
 SHA1 (patch-libgfortran_io_io.h) = d44676239a7f45e42054d24bd5224f43c20055c0
 SHA1 (patch-libquadmath_printf_quadmath-printf.c) = 78e09f1e6d61ee57cee83275093cf46b2335d204
 SHA1 (patch-libquadmath_strtod_strtod__l.c) = 6142c10d34174174cce7f06c37eab04dc431b2dc

Index: pkgsrc/lang/gcc15/options.mk
diff -u pkgsrc/lang/gcc15/options.mk:1.1 pkgsrc/lang/gcc15/options.mk:1.2
--- pkgsrc/lang/gcc15/options.mk:1.1    Mon Jul 14 17:44:53 2025
+++ pkgsrc/lang/gcc15/options.mk        Sat Nov  8 07:04:02 2025
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2025/07/14 17:44:53 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2025/11/08 07:04:02 mrg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${GCC_PKGNAME}
-PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
+PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-cobol gcc-fortran \
                        gcc-go gcc-objc gcc-objc++ gcc-graphite \
                        always-libgcc
 PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++ \
@@ -11,6 +11,10 @@ PKG_SUGGESTED_OPTIONS=       gcc-c++ gcc-fortr
 
 .if ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+=        nls
+. if ${MACHINE_PLATFORM:M*-x86_64} || ${MACHINE_PLATFORM:M*-aarch64}
+# Test riscv64 as well, it should work.
+PKG_SUGGESTED_OPTIONS+=        gcc-cobol
+. endif
 .elif ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=        nls
 .elif ${OPSYS} == "DragonFly"
@@ -152,6 +156,10 @@ LANGS+=                    go
 LANGS+=                        fortran
 .endif
 
+.if !empty(PKG_OPTIONS:Mgcc-cobol)
+LANGS+=                        cobol
+.endif
+
 .if !empty(PKG_OPTIONS:Mgcc-c++)
 LANGS+=                        c++
 USE_TOOLS+=            perl

Index: pkgsrc/lang/gcc15-libs/Makefile
diff -u pkgsrc/lang/gcc15-libs/Makefile:1.3 pkgsrc/lang/gcc15-libs/Makefile:1.4
--- pkgsrc/lang/gcc15-libs/Makefile:1.3 Sat Aug  9 15:53:10 2025
+++ pkgsrc/lang/gcc15-libs/Makefile     Sat Nov  8 07:04:02 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2025/08/09 15:53:10 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2025/11/08 07:04:02 mrg Exp $
 
 GCC_PKGNAME=   gcc15
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC15_DIS
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc15 package so that with the dependence pattern
 ## '{gcc15,gcc15-libs}>=15.1.*' pkg_add will choose gcc15-libs over gcc15.
-PKGREVISION=   1
+PKGREVISION=   2
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty

Added files:

Index: pkgsrc/lang/gcc15/patches/patch-configure
diff -u /dev/null pkgsrc/lang/gcc15/patches/patch-configure:1.1
--- /dev/null   Sat Nov  8 07:04:02 2025
+++ pkgsrc/lang/gcc15/patches/patch-configure   Sat Nov  8 07:04:02 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.1 2025/11/08 07:04:02 mrg Exp $
+
+Enable COBOL on NetBSD amd64/arm64/riscv64.
+
+
+--- configure.orig     2025-08-07 23:51:39.874338130 -0700
++++ configure  2025-11-05 19:28:09.763698065 -0800
+@@ -3581,14 +3581,14 @@ case ,${enable_languages}, in
+     ;;
+   *)
+     case "${target}" in
+-      aarch64-*-linux*|x86_64-*-linux*)
++      aarch64-*-linux*|x86_64-*-linux*|aarch64-*-netbsd*|x86_64-*-netbsd*|riscv64-*-netbsd*)
+         ;;
+       *-*-*)
+         unsupported_languages="$unsupported_languages cobol"
+         ;;
+     esac
+     case "${host}" in
+-      aarch64-*-linux*|x86_64-*-linux*)
++      aarch64-*-linux*|x86_64-*-linux*|aarch64-*-netbsd*|x86_64-*-netbsd*|riscv64-*-netbsd*)
+         ;;
+       *-*-*)
+         unsupported_languages="$unsupported_languages cobol"
Index: pkgsrc/lang/gcc15/patches/patch-configure.ac
diff -u /dev/null pkgsrc/lang/gcc15/patches/patch-configure.ac:1.1
--- /dev/null   Sat Nov  8 07:04:02 2025
+++ pkgsrc/lang/gcc15/patches/patch-configure.ac        Sat Nov  8 07:04:02 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure.ac,v 1.1 2025/11/08 07:04:02 mrg Exp $
+
+Enable COBOL on NetBSD amd64/arm64/riscv64.
+
+
+--- configure.ac.orig  2025-08-07 23:51:39.874338130 -0700
++++ configure.ac       2025-11-05 19:22:39.706058829 -0800
+@@ -801,14 +801,14 @@ case ,${enable_languages}, in
+     ;;
+   *)
+     case "${target}" in
+-      aarch64-*-linux*|x86_64-*-linux*)
++      aarch64-*-linux*|x86_64-*-linux*|aarch64-*-netbsd*|x86_64-*-netbsd*|riscv64-*-netbsd*)
+         ;;
+       *-*-*)
+         unsupported_languages="$unsupported_languages cobol"
+         ;;
+     esac
+     case "${host}" in
+-      aarch64-*-linux*|x86_64-*-linux*)
++      aarch64-*-linux*|x86_64-*-linux*|aarch64-*-netbsd*|x86_64-*-netbsd*|riscv64-*-netbsd*)
+         ;;
+       *-*-*)
+         unsupported_languages="$unsupported_languages cobol"
Index: pkgsrc/lang/gcc15/patches/patch-gcc_config_netbsd.h
diff -u /dev/null pkgsrc/lang/gcc15/patches/patch-gcc_config_netbsd.h:1.1
--- /dev/null   Sat Nov  8 07:04:02 2025
+++ pkgsrc/lang/gcc15/patches/patch-gcc_config_netbsd.h Sat Nov  8 07:04:02 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-gcc_config_netbsd.h,v 1.1 2025/11/08 07:04:02 mrg Exp $
+
+NetBSD doesn't have a -ldl.
+
+
+--- gcc/config/netbsd.h.orig   2025-08-07 23:51:40.599350224 -0700
++++ gcc/config/netbsd.h        2025-11-06 12:07:01.954484996 -0800
+@@ -166,3 +166,6 @@ along with GCC; see the file COPYING3.  
+   do {                                                                        \
+     netbsd_patch_builtins ();                                         \
+   } while(0)
++
++/* NetBSD does not have a dl library. */
++#define DL_LIBRARY ""
Index: pkgsrc/lang/gcc15/patches/patch-libgcc_config.host
diff -u /dev/null pkgsrc/lang/gcc15/patches/patch-libgcc_config.host:1.1
--- /dev/null   Sat Nov  8 07:04:02 2025
+++ pkgsrc/lang/gcc15/patches/patch-libgcc_config.host  Sat Nov  8 07:04:02 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-libgcc_config.host,v 1.1 2025/11/08 07:04:02 mrg Exp $
+
+Fix NetBSD/arm64.
+
+
+--- libgcc/config.host.orig    2025-08-07 23:51:44.833420855 -0700
++++ libgcc/config.host 2025-11-07 03:15:28.811881325 -0800
+@@ -424,6 +424,7 @@ aarch64*-*-freebsd*)
+ aarch64*-*-netbsd*)
+       extra_parts="$extra_parts crtfastmath.o"
+       tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
++      tmake_file="${tmake_file} ${cpu_type}/t-lse t-slibgcc-libgcc"
+       tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm"
+       tmake_file="${tmake_file} t-dfprules"
+       md_unwind_def_header=aarch64/aarch64-unwind-def.h
Index: pkgsrc/lang/gcc15/patches/patch-libgcc_enable-execute-stack-mprotect.c
diff -u /dev/null pkgsrc/lang/gcc15/patches/patch-libgcc_enable-execute-stack-mprotect.c:1.1
--- /dev/null   Sat Nov  8 07:04:02 2025
+++ pkgsrc/lang/gcc15/patches/patch-libgcc_enable-execute-stack-mprotect.c      Sat Nov  8 07:04:02 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-libgcc_enable-execute-stack-mprotect.c,v 1.1 2025/11/08 07:04:02 mrg Exp $
+
+Avoid GCC warning?
+
+
+--- libgcc/enable-execute-stack-mprotect.c.orig        2025-08-07 23:51:44.916422240 -0700
++++ libgcc/enable-execute-stack-mprotect.c     2025-11-05 20:05:27.517319554 -0800
+@@ -30,7 +30,6 @@
+ 
+ static int need_enable_exec_stack;
+ 
+-static void check_enabling (void) __attribute__ ((unused));
+ extern void __enable_execute_stack (void *);
+ 
+ #if defined __sun__ && defined __svr4__
Index: pkgsrc/lang/gcc15/patches/patch-libgcobol_configure.tgt
diff -u /dev/null pkgsrc/lang/gcc15/patches/patch-libgcobol_configure.tgt:1.1
--- /dev/null   Sat Nov  8 07:04:02 2025
+++ pkgsrc/lang/gcc15/patches/patch-libgcobol_configure.tgt     Sat Nov  8 07:04:02 2025
@@ -0,0 +1,31 @@
+$NetBSD: patch-libgcobol_configure.tgt,v 1.1 2025/11/08 07:04:02 mrg Exp $
+
+Enable libgcobol on NetBSD amd64, arm64, and riscv64.
+
+
+--- libgcobol/configure.tgt.orig       2025-08-07 23:51:44.929422457 -0700
++++ libgcobol/configure.tgt    2025-11-06 11:01:55.070054980 -0800
+@@ -26,7 +26,7 @@
+ LIBGCOBOL_SUPPORTED=no
+ 
+ case "${target}" in
+-    aarch64*-*-linux*)
++    aarch64*-*-linux* | aarch64*-*-netbsd*)
+       LIBGCOBOL_SUPPORTED=yes
+       ;;
+     powerpc64le-*-linux*)
+@@ -34,12 +34,12 @@ case "${target}" in
+               LIBGCOBOL_SUPPORTED=yes
+       fi
+       ;;
+-    riscv64-*-linux*)
++    riscv64-*-linux* | riscv64-*-netbsd*)
+       if test x$ac_cv_sizeof_void_p = x8; then
+               LIBGCOBOL_SUPPORTED=yes
+       fi
+       ;;
+-    x86_64-*-linux* | i?86-*-linux* | x86_64-*-darwin*)
++    x86_64-*-linux* | i?86-*-linux* | x86_64-*-darwin* | x86_64-*-netbsd*)
+       if test x$ac_cv_sizeof_void_p = x8; then
+               LIBGCOBOL_SUPPORTED=yes
+       fi