CVS commit: pkgsrc/emulators/spim

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Tue May  9 20:43:23 UTC 2023

Modified Files:
        pkgsrc/emulators/spim: Makefile distinfo
Added Files:
        pkgsrc/emulators/spim/patches: patch-scanner.l

Log Message:
emulators/spim: fix incorrect version comparisons, PR 57056 from "VMS"

It seems the lexer logic was checking the flex version with #if to
perform undocumented/unsupported frobs of the generated scanner's
internal state, but it had the version test wrong and so would have
been failing since flex's last minor version bump. The consequences
are apparently an infinite loop.

With the fix it no longer loops, but it still doesn't pass its own
very basic tests. It also uses its own builtin assembler (hence flex)
with nonstandard syntax (looks like also nonstandard semantics) and
who knows what else, so you're probably better off looking for a
different emulator.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/emulators/spim/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/spim/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/spim/patches/patch-scanner.l

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

Modified files:

Index: pkgsrc/emulators/spim/Makefile
diff -u pkgsrc/emulators/spim/Makefile:1.46 pkgsrc/emulators/spim/Makefile:1.47
--- pkgsrc/emulators/spim/Makefile:1.46 Fri Mar 20 11:57:36 2020
+++ pkgsrc/emulators/spim/Makefile      Tue May  9 20:43:22 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2020/03/20 11:57:36 nia Exp $
+# $NetBSD: Makefile,v 1.47 2023/05/09 20:43:22 dholland Exp $
 
 DISTNAME=      spim-8.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    emulators
 MASTER_SITES=  http://pages.cs.wisc.edu/~larus/SPIM/
 

Index: pkgsrc/emulators/spim/distinfo
diff -u pkgsrc/emulators/spim/distinfo:1.16 pkgsrc/emulators/spim/distinfo:1.17
--- pkgsrc/emulators/spim/distinfo:1.16 Tue Oct 26 10:24:01 2021
+++ pkgsrc/emulators/spim/distinfo      Tue May  9 20:43:22 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:24:01 nia Exp $
+$NetBSD: distinfo,v 1.17 2023/05/09 20:43:22 dholland Exp $
 
 BLAKE2s (spim-8.0.tar.gz) = 9a5373bce04ded172e0e063a9ebbcc870977fee6a6c3121de202777b72ff48c7
 SHA512 (spim-8.0.tar.gz) = c4eb66863a931b74d6c6ecd92860d16fd6369c85caecba1e71a1149e73e708502d1070f17a9beb6d0af1368db1ee5a85c040b596866a1236275cdd410a661adf
 Size (spim-8.0.tar.gz) = 355204 bytes
 SHA1 (patch-aa) = 8232ff358f1bf2ede3216187faf77aad85b1da87
 SHA1 (patch-ad) = 056ef015de5daff3003a834ff4867f97db70c79f
+SHA1 (patch-scanner.l) = 51e1c1b5e3c0db28d3fa0790729ddfa836631e2d

Added files:

Index: pkgsrc/emulators/spim/patches/patch-scanner.l
diff -u /dev/null pkgsrc/emulators/spim/patches/patch-scanner.l:1.1
--- /dev/null   Tue May  9 20:43:23 2023
+++ pkgsrc/emulators/spim/patches/patch-scanner.l       Tue May  9 20:43:22 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-scanner.l,v 1.1 2023/05/09 20:43:22 dholland Exp $
+
+Use correct version comparison logic.
+
+--- CPU/scanner.l~     2010-01-09 05:22:52.000000000 +0000
++++ CPU/scanner.l
+@@ -316,7 +316,7 @@ initialize_scanner (FILE *in_file)
+   yyin = in_file;
+ #ifdef FLEX_SCANNER
+   yyrestart(in_file);
+-#if (YY_FLEX_MAJOR_VERSION==2 && YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33)
++#if (YY_FLEX_MAJOR_VERSION==2 && YY_FLEX_MINOR_VERSION==5 && YY_FLEX_SUBMINOR_VERSION>=33) || (YY_FLEX_MAJOR_VERSION==2 && YY_FLEX_MINOR_VERSION>5)
+   /* flex 2.5.33 flipped the polarity of this flag (sigh) */
+   yy_init = 0;
+ #else