CVS commit: pkgsrc/lang/smlnj11072

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

Module Name:    pkgsrc
Committed By:   he
Date:           Sat Oct 12 20:00:06 UTC 2019

Modified Files:
        pkgsrc/lang/smlnj11072: Makefile Makefile.common distinfo
Added Files:
        pkgsrc/lang/smlnj11072/patches:
            patch-src_runtime_mach-dep_signal-sysdep.h
            patch-src_runtime_objs_mk.ppc-netbsd
Removed Files:
        pkgsrc/lang/smlnj11072/patches: patch-af

Log Message:
Various updates to smlnj 110.72 so that it builds on NetBSD/powerpc again:
 * Makefile.common: do PLILST.nlffi (though this file isn't used...)
 * Modernize the powerpc entry in signal-sysdep.h to use the
   various _UC_MACHINE_ macros.
 * mk.ppc-netbsd: don't pass an empty RANLIB variable, causing build failure.

Also make checksums of all the three arch-specific distfiles ("boxes"),
for sparc, x86 and ppc.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/smlnj11072/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/smlnj11072/Makefile.common
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/smlnj11072/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/smlnj11072/patches/patch-af
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/smlnj11072/patches/patch-src_runtime_mach-dep_signal-sysdep.h \
    pkgsrc/lang/smlnj11072/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/smlnj11072/Makefile
diff -u pkgsrc/lang/smlnj11072/Makefile:1.9 pkgsrc/lang/smlnj11072/Makefile:1.10
--- pkgsrc/lang/smlnj11072/Makefile:1.9 Sun Jul  3 19:35:36 2016
+++ pkgsrc/lang/smlnj11072/Makefile     Sat Oct 12 20:00:06 2019
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2016/07/03 19:35:36 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2019/10/12 20:00:06 he Exp $
 #
 
 DISTNAME=      boot.${BOX}-unix
 PKGNAME=       smlnj-${SML_VERSION}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://smlnj.cs.uchicago.edu/dist/working/${SML_VERSION}/
 DISTFILES=     MLRISC.tgz                      \
@@ -56,6 +57,14 @@ BUILD_ENV+=  PATCH=${PATCH:Q} PATCH_ARGS=
 # note that this includes bsd.prefs.mk
 .include "../../lang/smlnj/Makefile.common"
 
+BOXES= x86 ppc sparc
+
+.if make(distinfo) || make(makesum) || make(mdi)
+.for B in ${BOXES}
+DISTFILES+=    boot.${B}-unix.tgz
+.endfor
+.endif
+
 #
 # For smlnj reasons the runtime system needs to be unpacked twice, once
 # in work/src and once in work/base.

Index: pkgsrc/lang/smlnj11072/Makefile.common
diff -u pkgsrc/lang/smlnj11072/Makefile.common:1.4 pkgsrc/lang/smlnj11072/Makefile.common:1.5
--- pkgsrc/lang/smlnj11072/Makefile.common:1.4  Sun Jul  3 19:00:24 2016
+++ pkgsrc/lang/smlnj11072/Makefile.common      Sat Oct 12 20:00:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2016/07/03 19:00:24 dholland Exp $
+# $NetBSD: Makefile.common,v 1.5 2019/10/12 20:00:06 he Exp $
 #
 # used by lang/smlnj/Makefile
 
@@ -40,6 +40,7 @@ BOX=          x86
 PLIST.nlffi=   yes
 .elif ${MACHINE_ARCH} == "powerpc"
 BOX=           ppc
+PLIST.nlffi=   yes
 .elif ${MACHINE_ARCH} == "sparc"
 BOX=           ${MACHINE_ARCH}
 PLIST.nlffi=   yes

Index: pkgsrc/lang/smlnj11072/distinfo
diff -u pkgsrc/lang/smlnj11072/distinfo:1.10 pkgsrc/lang/smlnj11072/distinfo:1.11
--- pkgsrc/lang/smlnj11072/distinfo:1.10        Thu Mar 23 17:06:54 2017
+++ pkgsrc/lang/smlnj11072/distinfo     Sat Oct 12 20:00:06 2019
@@ -1,9 +1,17 @@
-$NetBSD: distinfo,v 1.10 2017/03/23 17:06:54 joerg Exp $
+$NetBSD: distinfo,v 1.11 2019/10/12 20:00:06 he Exp $
 
 SHA1 (smlnj-110.72/MLRISC.tgz) = 9bb9eb169337533304c2e0e4eb9af263d38c398a
 RMD160 (smlnj-110.72/MLRISC.tgz) = 484512df036421e216d4afed01beb978d33e16bb
 SHA512 (smlnj-110.72/MLRISC.tgz) = c66b157561604a443d630440516c8c33e5329ca52ab1fc9b4be68736de53bdbaf3dee208eb56db8e6eab25dfc175eaf1b6ab15f590d85aac30d566e737b4462c
 Size (smlnj-110.72/MLRISC.tgz) = 1432663 bytes
+SHA1 (smlnj-110.72/boot.ppc-unix.tgz) = 815447275d6321f85b6c97e84aa223f6d710b516
+RMD160 (smlnj-110.72/boot.ppc-unix.tgz) = f5e28578b1669a3799689a3cad247945b093b907
+SHA512 (smlnj-110.72/boot.ppc-unix.tgz) = fb6e24d6f0ed376c09d28cebe7099b275dc54e43442cfd577d146e62cf3d86ffacebf484d7ee9cdd6c3d7782fabbd30fd0994046f8f8aab8b57aace4c094a850
+Size (smlnj-110.72/boot.ppc-unix.tgz) = 5775803 bytes
+SHA1 (smlnj-110.72/boot.sparc-unix.tgz) = 56af0673ff071f92532f30d7797dbb079be36028
+RMD160 (smlnj-110.72/boot.sparc-unix.tgz) = 31ef6820b84efdf542824e6620816b607f0396b3
+SHA512 (smlnj-110.72/boot.sparc-unix.tgz) = 0bb399e43fc68cdb612f38ec00ba36f49074a6721614878c717ae09ae58c9b4d68215aac09388270ff9b53038370757712c8b69e289dc03fc950f8292da985eb
+Size (smlnj-110.72/boot.sparc-unix.tgz) = 5897256 bytes
 SHA1 (smlnj-110.72/boot.x86-unix.tgz) = 799f02f3e880a829b48962994b563f7321385d87
 RMD160 (smlnj-110.72/boot.x86-unix.tgz) = bd2962ea25d6f384a3f458759a1c655960dc4208
 SHA512 (smlnj-110.72/boot.x86-unix.tgz) = aaed02080d3b93260b11442bbb8dc1a2e9b59dbea0229f457307deb7b65bc253e16c20eb53e7cfaf92de1cf48359de01623d4f91d11b801b7d89d7a0a973fcb0
@@ -83,7 +91,6 @@ Size (smlnj-110.72/trace-debug-profile.t
 SHA1 (patch-aa) = f738a6284236158b6b95928768fe1213cc77fc20
 SHA1 (patch-ad) = 67802bbdf42408c60bbce4087f20d000a3445677
 SHA1 (patch-ae) = 0ba98fb2b012daf75dcc4ac416cbf0fd3182114b
-SHA1 (patch-af) = 3a1c1cadd26eb246adafff823d49b4ab7161793b
 SHA1 (patch-ah) = 93d7453dc82d91d29662cc02dd8ab9e8b8987393
 SHA1 (patch-ai) = 6a15a5415bd73e6618bc45b9a7eb021543e9cecd
 SHA1 (patch-aj) = 6318548da4c943c60fe63d41529803ea3fa2c96e
@@ -108,6 +115,7 @@ SHA1 (patch-src_runtime_gc_init-gc.c) = 
 SHA1 (patch-src_runtime_gc_mem-writer.c) = d43974ff5e8e576490656f9d24daf66fecab4849
 SHA1 (patch-src_runtime_kernel_main.c) = db26470b16f56e93ebecc62f34aa6b7a474089ec
 SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c
+SHA1 (patch-src_runtime_mach-dep_signal-sysdep.h) = ad72b10b9414279862f0b23734f2237ba1198721
 SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154
 SHA1 (patch-src_runtime_objs_mk.alpha32-dunix) = 9e3a36f4663cd685459f2fbde41b8c5f154bd9c2
 SHA1 (patch-src_runtime_objs_mk.alpha32x-osf1) = 6e91f672aadb77bd1d1ab65bfa66e3d7f745846c
@@ -118,6 +126,7 @@ SHA1 (patch-src_runtime_objs_mk.ppc-aix)
 SHA1 (patch-src_runtime_objs_mk.ppc-darwin) = 6ae822c7b39255b5204e358e3c21aa23b93883ec
 SHA1 (patch-src_runtime_objs_mk.ppc-darwin5) = 35ddd1f10a907ebbe6b4a3310c3bded83bda8ca0
 SHA1 (patch-src_runtime_objs_mk.ppc-linux) = 171ec491a536aa782880d3b3392cf0d728fd9c03
+SHA1 (patch-src_runtime_objs_mk.ppc-netbsd) = 8e10414204c5cf9d6b88dbe1ae31e0e1854e47b7
 SHA1 (patch-src_runtime_objs_mk.x86-cygwin) = b9e1174a956a63b1023eaf70322776fe93717782
 SHA1 (patch-src_runtime_objs_mk.x86-darwin) = 7770986d2805f66f1c4d4faff2fb66b2fb4b7b8d
 SHA1 (patch-src_runtime_objs_mk.x86-freebsd) = 2420f6a04ae78ca306daeb94a312f0e4fdcd0410

Added files:

Index: pkgsrc/lang/smlnj11072/patches/patch-src_runtime_mach-dep_signal-sysdep.h
diff -u /dev/null pkgsrc/lang/smlnj11072/patches/patch-src_runtime_mach-dep_signal-sysdep.h:1.1
--- /dev/null   Sat Oct 12 20:00:06 2019
+++ pkgsrc/lang/smlnj11072/patches/patch-src_runtime_mach-dep_signal-sysdep.h   Sat Oct 12 20:00:06 2019
@@ -0,0 +1,38 @@
+$NetBSD: patch-src_runtime_mach-dep_signal-sysdep.h,v 1.1 2019/10/12 20:00:06 he Exp $
+
+Support NetBSD and modernize the NetBSD ppc entry.
+
+--- src/runtime/mach-dep/signal-sysdep.h.orig  2010-02-03 16:40:32.000000000 +0000
++++ src/runtime/mach-dep/signal-sysdep.h
+@@ -175,7 +175,7 @@ extern void SetFSR(int);
+   /* disable all FP exceptions */
+ #  define SIG_InitFPE()    SetFSR(0)
+ 
+-#  if defined(OPSYS_SUNOS)
++#  if defined(OPSYS_SUNOS) || defined(OPSYS_NETBSD)
+     /** SPARC, SUNOS **/
+ #    define USE_ZERO_LIMIT_PTR_FN
+ #    define SIG_FAULT1                SIGFPE
+@@ -344,6 +344,22 @@ extern void SetFSR();
+ #    define SIG_ResetFPE(scp)           { (scp)->regs->gpr[PT_FPSCR] = 0x0; }
+      typedef void SigReturn_t;
+ 
++#  elif (defined(TARGET_PPC) && defined(OPSYS_NETBSD))
++    /* PPC, NetBSD */
++
++#    define SIG_FAULT1          SIGTRAP
++
++#    define INT_DIVZERO(s, c)           ((s) == SIGTRAP)
++#    define INT_OVFLW(s, c)             ((s) == SIGTRAP)
++#    define SIG_GetPC(scp)              _UC_MACHINE_PC((scp))
++#    define SIG_SetPC(scp, addr)        { \
++      _UC_MACHINE_SET_PC((scp), (intptr_t)(addr)); }
++#    define SIG_ZeroLimitPtr(scp)       { \
++      (scp)->uc_mcontext.__gregs[_REG_R15] = 0; \
++      } /* limitptr = 15 (see src/runtime/mach-dep/PPC.prim.asm) */
++#    define SIG_GetCode(info,scp)       ((info)->si_code)
++     typedef void SigReturn_t;
++
+ #  endif /* HOST_RS6000/HOST_PPC */
+ 
+ #elif defined(HOST_HPPA)
Index: pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.ppc-netbsd
diff -u /dev/null pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.ppc-netbsd:1.1
--- /dev/null   Sat Oct 12 20:00:06 2019
+++ pkgsrc/lang/smlnj11072/patches/patch-src_runtime_objs_mk.ppc-netbsd Sat Oct 12 20:00:06 2019
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_runtime_objs_mk.ppc-netbsd,v 1.1 2019/10/12 20:00:06 he Exp $
+
+Don't pass an empty RANLIB.
+
+--- ./src/runtime/objs/mk.ppc-netbsd.orig      2019-10-12 12:50:38.396269900 +0000
++++ ./src/runtime/objs/mk.ppc-netbsd
+@@ -22,4 +22,4 @@ VERSION =    v-ppc-netbsd
+ RUNTIME =     run.ppc-netbsd
+ 
+ all:
+-      ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" 
XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
++      ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" 
XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))