CVS commit: pkgsrc/devel/boehm-gc

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

Module Name:    pkgsrc
Committed By:   mrg
Date:           Mon Dec  8 02:09:56 UTC 2025

Modified Files:
        pkgsrc/devel/boehm-gc: Makefile distinfo
        pkgsrc/devel/boehm-gc/patches: patch-include_private_gcconfig.h

Log Message:
make this work on netbsd mips n64 -- don't pretend to be 32 bit.

noticed when w3m build didn't.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/devel/boehm-gc/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/devel/boehm-gc/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/devel/boehm-gc/patches/patch-include_private_gcconfig.h

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

Modified files:

Index: pkgsrc/devel/boehm-gc/Makefile
diff -u pkgsrc/devel/boehm-gc/Makefile:1.107 pkgsrc/devel/boehm-gc/Makefile:1.108
--- pkgsrc/devel/boehm-gc/Makefile:1.107        Fri Dec 29 01:09:23 2023
+++ pkgsrc/devel/boehm-gc/Makefile      Mon Dec  8 02:09:56 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2023/12/29 01:09:23 zafer Exp $
+# $NetBSD: Makefile,v 1.108 2025/12/08 02:09:56 mrg Exp $
 
 DISTNAME=      gc-8.2.4
 PKGNAME=       ${DISTNAME:S/gc/boehm-gc/}
@@ -26,6 +26,8 @@ TEST_TARGET=          check
 CFLAGS+=               -D_XOPEN_SOURCE
 .endif
 
+#CFLAGS+=              -O0 -g
+
 .include "options.mk"
 
 post-install:

Index: pkgsrc/devel/boehm-gc/distinfo
diff -u pkgsrc/devel/boehm-gc/distinfo:1.73 pkgsrc/devel/boehm-gc/distinfo:1.74
--- pkgsrc/devel/boehm-gc/distinfo:1.73 Thu Oct 19 15:36:26 2023
+++ pkgsrc/devel/boehm-gc/distinfo      Mon Dec  8 02:09:56 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.73 2023/10/19 15:36:26 wiz Exp $
+$NetBSD: distinfo,v 1.74 2025/12/08 02:09:56 mrg Exp $
 
 BLAKE2s (gc-8.2.4.tar.gz) = 204148bc44bdce40ac21085bda3cbaec416badf77e5705ed14eeae292483ec30
 SHA512 (gc-8.2.4.tar.gz) = 27d014378000f25fb2f5598904be85604822d5ed4553f8b3d1c279122300d3958b4432ec08f951cfd842d92121ea8a030dda34bf2475ec53d4fded551fdd3a98
 Size (gc-8.2.4.tar.gz) = 1210929 bytes
-SHA1 (patch-include_private_gcconfig.h) = 76b2e33017d4792c79f4540b47350649d514fe0e
+SHA1 (patch-include_private_gcconfig.h) = bcd9c1d0a12189fd5c2bb1905d9055e597a50e6e

Index: pkgsrc/devel/boehm-gc/patches/patch-include_private_gcconfig.h
diff -u pkgsrc/devel/boehm-gc/patches/patch-include_private_gcconfig.h:1.7 pkgsrc/devel/boehm-gc/patches/patch-include_private_gcconfig.h:1.8
--- pkgsrc/devel/boehm-gc/patches/patch-include_private_gcconfig.h:1.7  Sun May 28 06:12:21 2023
+++ pkgsrc/devel/boehm-gc/patches/patch-include_private_gcconfig.h      Mon Dec  8 02:09:56 2025
@@ -1,10 +1,11 @@
-$NetBSD: patch-include_private_gcconfig.h,v 1.7 2023/05/28 06:12:21 dholland Exp $
+$NetBSD: patch-include_private_gcconfig.h,v 1.8 2025/12/08 02:09:56 mrg Exp $
 
 Recognize riscv on netbsd. https://github.com/ivmai/bdwgc/issues/556
+Add support for 64-bit NetBSD/mips.
 
---- include/private/gcconfig.h~        2022-08-26 18:44:49.000000000 +0000
-+++ include/private/gcconfig.h
-@@ -676,7 +676,7 @@ EXTERN_C_BEGIN
+--- include/private/gcconfig.h.orig    2023-05-26 11:56:18.000000000 -0700
++++ include/private/gcconfig.h 2025-12-07 17:58:41.769883216 -0800
+@@ -682,7 +682,7 @@ EXTERN_C_BEGIN
  #   define mach_type_known
  # endif
  # if defined(__riscv) && (defined(FREEBSD) || defined(LINUX) \
@@ -13,3 +14,23 @@ Recognize riscv on netbsd. https://githu
  #   define RISCV
  #   define mach_type_known
  # endif
+@@ -1804,12 +1804,17 @@ EXTERN_C_BEGIN
+ #       define ALIGNMENT 4
+ #   endif
+ #   ifdef NETBSD
+-#     define ALIGNMENT 4
++#     ifdef _MIPS_SZPTR
++#       define CPP_WORDSZ _MIPS_SZPTR
++#       define ALIGNMENT (_MIPS_SZPTR/8)
++#     else
++#       define ALIGNMENT 4
++#     endif
+ #     ifndef __ELF__
+ #       define DATASTART ((ptr_t)0x10000000)
+ #       define STACKBOTTOM ((ptr_t)0x7ffff000)
+ #     endif
+-#  endif
++#   endif
+ #  ifdef OPENBSD
+ #     define CPP_WORDSZ 64 /* all OpenBSD/mips platforms are 64-bit */
+ #     define ALIGNMENT 8