pull in fix from upstream for gxtags; this was causing repeated failures on exopi,

and i think this will also unbreak this port for i386
This commit is contained in:
jasper 2020-11-04 18:46:01 +00:00
parent 80ce037272
commit fbc63db2df
2 changed files with 22 additions and 2 deletions

View File

@ -1,6 +1,5 @@
# $OpenBSD: Makefile,v 1.10 2020/08/19 11:28:29 jasper Exp $
# $OpenBSD: Makefile,v 1.11 2020/11/04 18:46:01 jasper Exp $
BROKEN-i386 = fails after "[*] Build gerbil tags"
BROKEN-powerpc64=gsc spins during build
# Gambit doesn't have thread-local storage support on GCC platforms
@ -11,6 +10,7 @@ COMMENT = dialect of Scheme designed for systems programming
GH_ACCOUNT = vyzo
GH_PROJECT = gerbil
GH_TAGNAME = v0.15.1
REVISION = 0
CATEGORIES = lang

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_tools_gxtags_ss,v 1.1 2020/11/04 18:46:01 jasper Exp $
https://github.com/vyzo/gerbil/commit/64968c943ac2a1900e9e19643c0e619d80ee108e
Index: src/tools/gxtags.ss
--- src/tools/gxtags.ss.orig
+++ src/tools/gxtags.ss
@@ -241,8 +241,10 @@
(lp (fx1+ i) offs))))))))
(def (source-location-line locat)
- (let (filepos (##position->filepos (##locat-position locat)))
- (fx1+ (##filepos-line filepos))))
+ (if (##locat? locat)
+ (let (filepos (##position->filepos (##locat-position locat)))
+ (fx1+ (##filepos-line filepos)))
+ 1))
(def (try-import-module filename)
(try