Friday, April 30, 2021

update lang/sbcl

This updates sbcl to latest version, we are a bit outdated.

I had to manually fix patch for src/runtime/Config.generic-openbsd

I tested stumpwm and compiling sbcl with itself

Index: Makefile
===================================================================
RCS file: /home/reposync/ports/lang/sbcl/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 15 Mar 2020 19:53:59 -0000 1.44
+++ Makefile 30 Apr 2021 07:12:44 -0000
@@ -6,7 +6,7 @@ USE_WXNEEDED = Yes

COMMENT= compiler and runtime system for ANSI Common Lisp

-V = 2.0.1
+V = 2.1.4
DISTNAME= sbcl-${V}-source
PKGNAME= sbcl-${V}
WRKDIST= ${WRKDIR}/sbcl-${V}
Index: distinfo
===================================================================
RCS file: /home/reposync/ports/lang/sbcl/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo 15 Mar 2020 19:53:59 -0000 1.19
+++ distinfo 30 Apr 2021 07:14:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (sbcl-2.0.1-source.tar.bz2) = hFDWC3Jko0FY+IEdRtxudP+FW70SJ3Ulcod+ZgTOVug=
-SIZE (sbcl-2.0.1-source.tar.bz2) = 6466983
+SHA256 (sbcl-2.1.4-source.tar.bz2) = mSYOI0b80irlVG4VuvUImdyzt1psdMx8yEk3iJnvvRE=
+SIZE (sbcl-2.1.4-source.tar.bz2) = 6550812
Index: patches/patch-src_runtime_Config_generic-openbsd
===================================================================
RCS file: /home/reposync/ports/lang/sbcl/patches/patch-src_runtime_Config_generic-openbsd,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_runtime_Config_generic-openbsd
--- patches/patch-src_runtime_Config_generic-openbsd 14 May 2019 07:59:53 -0000 1.4
+++ patches/patch-src_runtime_Config_generic-openbsd 30 Apr 2021 10:32:35 -0000
@@ -1,17 +1,19 @@
-$OpenBSD: patch-src_runtime_Config_generic-openbsd,v 1.4 2019/05/14 07:59:53 solene Exp $
+$OpenBSD$

Don't try to guess (wrong) with clang. Just assume we have pie

Index: src/runtime/Config.generic-openbsd
--- src/runtime/Config.generic-openbsd.orig
+++ src/runtime/Config.generic-openbsd
-@@ -17,9 +17,7 @@ CFLAGS += -pthread -DOS_THREAD_STACK
+@@ -17,11 +17,7 @@ CFLAGS += -pthread
OS_LIBS += -pthread
endif

+-ifeq ($(DISABLE_PIE),yes)
-ifneq ($(shell $(CC) -dM -E - < /dev/null 2>/dev/null | grep -e '__clang__'),)
CFLAGS += -fno-pie
- LINKFLAGS += -Wl,-nopie
+ LINKFLAGS += -nopie
LDFLAGS += -nopie
__LDFLAGS__ += -nopie
+-endif
-endif
Index: patches/patch-src_runtime_GNUmakefile
===================================================================
RCS file: /home/reposync/ports/lang/sbcl/patches/patch-src_runtime_GNUmakefile,v
retrieving revision 1.9
diff -u -p -r1.9 patch-src_runtime_GNUmakefile
--- patches/patch-src_runtime_GNUmakefile 15 Mar 2020 19:54:00 -0000 1.9
+++ patches/patch-src_runtime_GNUmakefile 30 Apr 2021 10:32:42 -0000
@@ -2,12 +2,12 @@ $OpenBSD: patch-src_runtime_GNUmakefile,
Index: src/runtime/GNUmakefile
--- src/runtime/GNUmakefile.orig
+++ src/runtime/GNUmakefile
-@@ -34,7 +34,7 @@ __LDFLAGS__ =
+@@ -33,7 +33,7 @@ __LDFLAGS__ =

include ../../output/prefix.def

-CFLAGS += -g -Wall -Wundef -Wsign-compare -Wpointer-arith -O3
+CFLAGS += -Wall -Wundef -Wsign-compare -Wpointer-arith
ASFLAGS += $(CFLAGS)
- CPPFLAGS += -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\"
+ CPPFLAGS += -I.

Index: patches/patch-src_runtime_gc-common_c
===================================================================
RCS file: /home/reposync/ports/lang/sbcl/patches/patch-src_runtime_gc-common_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_runtime_gc-common_c
--- patches/patch-src_runtime_gc-common_c 15 Mar 2020 19:54:00 -0000 1.3
+++ patches/patch-src_runtime_gc-common_c 30 Apr 2021 10:32:42 -0000
@@ -5,7 +5,7 @@ clang only has it as builtin
Index: src/runtime/gc-common.c
--- src/runtime/gc-common.c.orig
+++ src/runtime/gc-common.c
-@@ -57,6 +57,8 @@
+@@ -58,6 +58,8 @@
#define LONG_FLOAT_SIZE 3

No comments:

Post a Comment