CVS commit: pkgsrc/lang/smlnj

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Apr 22 18:35:06 UTC 2024

Modified Files:
        pkgsrc/lang/smlnj: distinfo
        pkgsrc/lang/smlnj/patches: patch-src_runtime_objs_mk.ppc-netbsd
Added Files:
        pkgsrc/lang/smlnj/patches: patch-src_runtime_include_asm-base.h
            patch-src_runtime_mach-dep_unix-fault.c

Log Message:
lang/smlnj: make this build on NetBSD/powerpc.

OK'ed by MAINTAINER.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/smlnj/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/smlnj/patches/patch-src_runtime_include_asm-base.h \
    pkgsrc/lang/smlnj/patches/patch-src_runtime_mach-dep_unix-fault.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-netbsd

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

Modified files:

Index: pkgsrc/lang/smlnj/distinfo
diff -u pkgsrc/lang/smlnj/distinfo:1.28 pkgsrc/lang/smlnj/distinfo:1.29
--- pkgsrc/lang/smlnj/distinfo:1.28     Sat Feb 25 17:58:39 2023
+++ pkgsrc/lang/smlnj/distinfo  Mon Apr 22 18:35:05 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2023/02/25 17:58:39 ryoon Exp $
+$NetBSD: distinfo,v 1.29 2024/04/22 18:35:05 he Exp $
 
 BLAKE2s (smlnj-110.99.3/MLRISC.tgz) = cb6a621384f1ef29c31b659a0ad071a8925e1e54d118d6cb292bd0146025fef3
 SHA512 (smlnj-110.99.3/MLRISC.tgz) = f1f2d7cd1316bd6c4156fc184990ccfee916993283ce0963ff30306089b5c6297d2c4fe55a280f17ae05ad45a764e3bdfcfd1b8ee9a8382a049f323b48692c8a
@@ -90,7 +90,9 @@ SHA1 (patch-src_runtime_gc_c-globals-tbl
 SHA1 (patch-src_runtime_gc_gc-stats.h) = 0160eec114563b2feebef62445225c39455ac193
 SHA1 (patch-src_runtime_gc_heap-out-util.c) = 214c673e57efda9346b200509a1beb48af2aa443
 SHA1 (patch-src_runtime_gc_init-gc.c) = e0c2330c7d5ca4b4e6a68c5ce8cbad8dcbee1363
+SHA1 (patch-src_runtime_include_asm-base.h) = 77679d5b93d1f788d6b9f732d4ef7168ff78518f
 SHA1 (patch-src_runtime_mach-dep_signal-sysdep.h) = 7d91bae4f7eb5c944de79c68be80e86b1143c092
+SHA1 (patch-src_runtime_mach-dep_unix-fault.c) = bbb6e1e371f9e9866f9d0d948bcb6787112c55c0
 SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154
 SHA1 (patch-src_runtime_objs_mk.amd64-cygwin) = 4d9d856001b4ecf245a3727fc9b2f7568fb1eb74
 SHA1 (patch-src_runtime_objs_mk.amd64-darwin) = 51a18c3e3aae9af87b8baabc009306a1840a5613
@@ -100,7 +102,7 @@ SHA1 (patch-src_runtime_objs_mk.amd64-ne
 SHA1 (patch-src_runtime_objs_mk.ppc-aix) = 509ffc0152b2cdfa4e0f6621bed026fe0f1edc99
 SHA1 (patch-src_runtime_objs_mk.ppc-darwin) = 6ae822c7b39255b5204e358e3c21aa23b93883ec
 SHA1 (patch-src_runtime_objs_mk.ppc-linux) = 171ec491a536aa782880d3b3392cf0d728fd9c03
-SHA1 (patch-src_runtime_objs_mk.ppc-netbsd) = dd532b009e08825fe7765772f93312202defabfc
+SHA1 (patch-src_runtime_objs_mk.ppc-netbsd) = a4807093a85a6658a6adebb6b6ed12182fdac66e
 SHA1 (patch-src_runtime_objs_mk.x86-cygwin) = 40ec254c8ab1d098c1c7b9a792a36137e54ed9df
 SHA1 (patch-src_runtime_objs_mk.x86-darwin) = 0a4c7eec294da0c3b4cd1dfe607456bd604d543c
 SHA1 (patch-src_runtime_objs_mk.x86-freebsd) = ff5b8d11ed0865e6178728270017360bd4a4250f

Index: pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-netbsd
diff -u pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-netbsd:1.1 pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-netbsd:1.2
--- pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-netbsd:1.1  Sat Oct 12 20:52:54 2019
+++ pkgsrc/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-netbsd      Mon Apr 22 18:35:06 2024
@@ -1,10 +1,21 @@
-$NetBSD: patch-src_runtime_objs_mk.ppc-netbsd,v 1.1 2019/10/12 20:52:54 he Exp $
+$NetBSD: patch-src_runtime_objs_mk.ppc-netbsd,v 1.2 2024/04/22 18:35:06 he Exp $
 
 Don't pass an empty RANLIB.
+Define ARCH_PPC and not HOST_PPC, and do -lm.
 
 --- src/runtime/objs/mk.ppc-netbsd.orig        2019-10-12 20:10:48.309504473 +0000
 +++ src/runtime/objs/mk.ppc-netbsd
-@@ -22,4 +22,4 @@ VERSION =    v-ppc-netbsd
+@@ -14,12 +14,13 @@ CPP =              $(GCC) -x c -E -P
+ #XOBJS =      xmonitor.o
+ #LD_LIBS =    -lX11
+ #BASE_DEFS =  -DHEAP_MONITOR -DPOLL_DEBUG
++LD_LIBS=      -lm
+ XOBJS =
+ XLIBS =
+-DEFS =                $(BASE_DEFS) -DHOST_PPC -DTARGET_PPC -DOPSYS_UNIX -DOPSYS_NETBSD
++DEFS =                $(BASE_DEFS) -DARCH_PPC -DTARGET_PPC -DOPSYS_UNIX -DOPSYS_NETBSD
+ TARGET =      PPC
+ VERSION =     v-ppc-netbsd
  RUNTIME =     run.ppc-netbsd
  
  all:

Added files:

Index: pkgsrc/lang/smlnj/patches/patch-src_runtime_include_asm-base.h
diff -u /dev/null pkgsrc/lang/smlnj/patches/patch-src_runtime_include_asm-base.h:1.1
--- /dev/null   Mon Apr 22 18:35:06 2024
+++ pkgsrc/lang/smlnj/patches/patch-src_runtime_include_asm-base.h      Mon Apr 22 18:35:06 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_include_asm-base.h,v 1.1 2024/04/22 18:35:06 he Exp $
+
+Add support for NetBSD/powerpc.
+
+--- src/runtime/include/asm-base.h.orig        2022-07-28 04:55:45.000000000 +0000
++++ src/runtime/include/asm-base.h
+@@ -81,7 +81,7 @@
+ #    define LABEL(ID) ID:
+ #    define __SC__      @
+ 
+-#  elif defined(OPSYS_OPENBSD)
++#  elif defined(OPSYS_OPENBSD) || defined(OPSYS_NETBSD)
+ #    define CFUNSYM(ID) CSYM(ID)
+ #    define GLOBAL(ID)  .globl  ID
+ #    define TEXT        .text
Index: pkgsrc/lang/smlnj/patches/patch-src_runtime_mach-dep_unix-fault.c
diff -u /dev/null pkgsrc/lang/smlnj/patches/patch-src_runtime_mach-dep_unix-fault.c:1.1
--- /dev/null   Mon Apr 22 18:35:06 2024
+++ pkgsrc/lang/smlnj/patches/patch-src_runtime_mach-dep_unix-fault.c   Mon Apr 22 18:35:06 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_runtime_mach-dep_unix-fault.c,v 1.1 2024/04/22 18:35:06 he Exp $
+
+Ignore absence of SIG_OVERFLOW.
+
+--- src/runtime/mach-dep/unix-fault.c.orig     2022-07-28 04:55:45.000000000 +0000
++++ src/runtime/mach-dep/unix-fault.c
+@@ -47,8 +47,6 @@ void InitFaultHandlers (ml_state_t *msp)
+   /** Set up the Overflow fault(s) **/
+ #ifdef SIG_OVERFLOW
+     SIG_SetHandler (SIG_OVERFLOW, FaultHandler);
+-#else
+-# error now signal for Overflow specified
+ #endif
+ #ifdef SIG_OVERFLOW2
+     SIG_SetHandler (SIG_OVERFLOW2, FaultHandler);