Don't try to optimize some files, clang will require up to 8GB of memory

for tracking all the jumps.

4 files changed, 53 insertions, 2 deletions

diff --git a/lang/gambc/Makefile b/lang/gambc/Makefile
index 79eb13b051f..fbdf6ad6b7f 100644
--- a/lang/gambc/Makefile
+++ b/lang/gambc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/02 20:11:39 asau Exp $
+# $NetBSD: Makefile,v 1.11 2013/12/15 19:39:34 joerg Exp $
 #
 
 DISTNAME=	gambc-${GAMBC_DIST_VERSION}
@@ -73,6 +73,11 @@ PACKAGE_STRING=		${${PKGBASE} ${PKGVERSION}:L}
 
 .include "version.mk"
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+MAKE_ENV+=	CLANG_NO_OPT=-O0
+.endif
+
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gambc/distinfo b/lang/gambc/distinfo
index 059d16fdbc5..9d2e185ffce 100644
--- a/lang/gambc/distinfo
+++ b/lang/gambc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2012/04/16 10:19:34 asau Exp $
+$NetBSD: distinfo,v 1.6 2013/12/15 19:39:34 joerg Exp $
 
 SHA1 (gambc-v4_6_5.tgz) = 16a73446440714aa1985c861aa225d0238528544
 RMD160 (gambc-v4_6_5.tgz) = 2ab84686483c541b1a2e182520740bf8293d266c
@@ -7,3 +7,5 @@ SHA1 (patch-aa) = 0c87076ccab2483865d269a6a3542e83b76563c5
 SHA1 (patch-ab) = fb2adfbe600706d291876b858a4144be50c7c6e0
 SHA1 (patch-examples_iOS_build-gambit-iOS) = 73afbc3aeb7a10c844403ae526539498e9730148
 SHA1 (patch-examples_iOS_make-keys) = d556004fe8f87d66c3522a603ee6592047de992a
+SHA1 (patch-gsc_makefile.in) = d9a0ff66425ffc804e397e8720f224fe059d90d6
+SHA1 (patch-lib_makefile.in) = 3d7628f7b4a4fe268b566e1b927acdbd07fd184e
diff --git a/lang/gambc/patches/patch-gsc_makefile.in b/lang/gambc/patches/patch-gsc_makefile.in
new file mode 100644
index 00000000000..12a50b9e1bb
--- /dev/null
+++ b/lang/gambc/patches/patch-gsc_makefile.in
@@ -0,0 +1,17 @@
+$NetBSD: patch-gsc_makefile.in,v 1.1 2013/12/15 19:39:34 joerg Exp $
+
+--- gsc/makefile.in.orig	2013-12-15 14:34:50.000000000 +0000
++++ gsc/makefile.in
+@@ -208,8 +208,11 @@ _gsc@obj@: _gsc.c
+ _gsc_@obj@: _gsc_.c
+ 	@BUILD_OBJ@
+ 
++CFLAGS._t-c-2.c= ${CLANG_NO_OPT}
++CFLAGS._x86.c= ${CLANG_NO_OPT}
++
+ .c@obj@:
+-	@BUILD_OBJ@ -D___LIBRARY
++	@BUILD_OBJ@ -D___LIBRARY ${CFLAGS.$<}
+ 
+ .scm.c:
+ 	@SETDLPATH@ $(rootfromhere)/gsc-comp -:~~bin=$(srcdirpfx)$(rootfromhere)/bin,~~lib=$(srcdirpfx)$(rootfromhere)/lib,~~include=$(srcdirpfx)$(rootfromhere)/include -f -c -check $(srcdirpfx)$*.scm
diff --git a/lang/gambc/patches/patch-lib_makefile.in b/lang/gambc/patches/patch-lib_makefile.in
new file mode 100644
index 00000000000..f9cd7bcb16e
--- /dev/null
+++ b/lang/gambc/patches/patch-lib_makefile.in
@@ -0,0 +1,27 @@
+$NetBSD: patch-lib_makefile.in,v 1.1 2013/12/15 19:39:34 joerg Exp $
+
+--- lib/makefile.in.orig	2009-08-01 21:29:10.000000000 +0000
++++ lib/makefile.in
+@@ -8,8 +8,8 @@ SUBDIRS = guide
+ 
+ PACKAGE_SHORTNAME = @PACKAGE_SHORTNAME@
+ PACKAGE_NAME = @PACKAGE_NAME@
+-PACKAGE_VERSION = @PACKAGE_VERSION@
+-PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_VERSION = 4.6.5
++PACKAGE_STRING = gambc 4.6.5
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ 
+@@ -136,8 +136,10 @@ all-pre:
+ 
+ all-post: $(LIBRARY) _$(GAMBCLIB).c
+ 
++CFLAGS._io.c= ${CLANG_NO_OPT}
++
+ .c@obj@:
+-	@BUILD_OBJ@ -D___LIBRARY
++	@BUILD_OBJ@ -D___LIBRARY ${CFLAGS.$<}
+ 
+ .scm.c:
+ 	@SETDLPATH@ $(rootfromhere)/gsc-comp -:~~bin=$(srcdirpfx)$(rootfromhere)/bin,~~lib=$(srcdirpfx)$(rootfromhere)/lib,~~include=$(srcdirpfx)$(rootfromhere)/include -f -c -check $(srcdirpfx)$*.scm