From 6594b034ecb4bf2dd8247a868e0fa63c8a2f60df Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Thu, 24 Mar 2022 20:17:43 +0000
Subject: [PATCH] lang/gambit: remove the -O1 workaround again

After tweaks to malloc(3), clang 13 now builds this fast enough for the
package building machines.
prodded by otto@, ok juanfra@
---
 lang/gambit/Makefile                      |  6 +-----
 lang/gambit/patches/patch-gsc_makefile_in | 18 ------------------
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 lang/gambit/patches/patch-gsc_makefile_in

diff --git a/lang/gambit/Makefile b/lang/gambit/Makefile
index 97548a41e84..38a5b472c77 100644
--- a/lang/gambit/Makefile
+++ b/lang/gambit/Makefile
@@ -3,6 +3,7 @@ BROKEN-riscv64=	gsi and gsi-script segfault at startup
 COMMENT=	complete, efficient and reliable implementation of Scheme
 
 V=		4.9.4
+REVISION=	0
 DISTNAME=	gambit-v${V:S/./_/g}
 PKGNAME=	gambit-$V
 API_V=		${V:R:S/./0/}00${V:E}
@@ -52,8 +53,3 @@ do-test:
 		${TEST_FLAGS} -f makefile ${TEST_TARGET}
 
 .include <bsd.port.mk>
-
-# It takes forever to build the package with Clang 13
-.if ${CHOSEN_COMPILER} == "base-clang"
-MAKE_ENV +=	CLANG_FLAGS=-O1
-.endif
diff --git a/lang/gambit/patches/patch-gsc_makefile_in b/lang/gambit/patches/patch-gsc_makefile_in
deleted file mode 100644
index c238d08f851..00000000000
--- a/lang/gambit/patches/patch-gsc_makefile_in
+++ /dev/null
@@ -1,18 +0,0 @@
-Clang 13 workaround
-
-Index: gsc/makefile.in
---- gsc/makefile.in.orig
-+++ gsc/makefile.in
-@@ -301,6 +301,12 @@ $(LINKFILE_O): $(LINKFILE_C)
- _gsc@obj@: _gsc.c
- 	@BUILD_OBJ@
- 
-+_t-univ-2@obj@:
-+	@BUILD_OBJ@ $(CLANG_FLAGS) -D___LIBRARY
-+
-+_t-univ-4@obj@:
-+	@BUILD_OBJ@ $(CLANG_FLAGS) -D___LIBRARY
-+
- .c@obj@:
- 	@BUILD_OBJ@ -D___LIBRARY
-