Sun Dec 15 19:39:34 2013 UTC ()
Don't try to optimize some files, clang will require up to 8GB of memory
for tracking all the jumps.


(joerg)
diff -r1.10 -r1.11 pkgsrc/lang/gambc/Makefile
diff -r1.5 -r1.6 pkgsrc/lang/gambc/distinfo
diff -r0 -r1.1 pkgsrc/lang/gambc/patches/patch-gsc_makefile.in
diff -r0 -r1.1 pkgsrc/lang/gambc/patches/patch-lib_makefile.in
cvs diff -r1.10 -r1.11 pkgsrc/lang/gambc/Makefile (switch to unified diff)

--- pkgsrc/lang/gambc/Makefile 2012/10/02 20:11:39 1.10
+++ pkgsrc/lang/gambc/Makefile 2013/12/15 19:39:34 1.11
@@ -1,78 +1,83 @@ @@ -1,78 +1,83 @@
1# $NetBSD: Makefile,v 1.10 2012/10/02 20:11:39 asau Exp $ 1# $NetBSD: Makefile,v 1.11 2013/12/15 19:39:34 joerg Exp $
2# 2#
3 3
4DISTNAME= gambc-${GAMBC_DIST_VERSION} 4DISTNAME= gambc-${GAMBC_DIST_VERSION}
5PKGNAME= gambc-${GAMBC_VERSION} 5PKGNAME= gambc-${GAMBC_VERSION}
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/ 7MASTER_SITES= http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.iro.umontreal.ca/~gambit/ 11HOMEPAGE= http://www.iro.umontreal.ca/~gambit/
12COMMENT= GambitC Scheme System 12COMMENT= GambitC Scheme System
13 13
14NOT_FOR_BULK_PLATFORM+= SunOS-*-* 14NOT_FOR_BULK_PLATFORM+= SunOS-*-*
15 15
16# bin/scheme-r5rs 16# bin/scheme-r5rs
17CONFLICTS+= scheme48>=1.2 17CONFLICTS+= scheme48>=1.2
18 18
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
21USE_TOOLS+= gmake 21USE_TOOLS+= gmake
22 22
23CONFIGURE_ARGS+= --enable-single-host 23CONFIGURE_ARGS+= --enable-single-host
24CONFIGURE_ARGS+= --enable-cplusplus 24CONFIGURE_ARGS+= --enable-cplusplus
25CONFIGURE_ARGS+= --enable-shared 25CONFIGURE_ARGS+= --enable-shared
26CONFIGURE_ARGS+= --disable-absolute-shared-libs # DESTDIR bug? 26CONFIGURE_ARGS+= --disable-absolute-shared-libs # DESTDIR bug?
27### 27###
28### XXX On NetBSD/amd64 4.99.61, gcc had a resident memory size of over 384MB 28### XXX On NetBSD/amd64 4.99.61, gcc had a resident memory size of over 384MB
29### while building this and ultimately exhausted all 1GB of swap I had. 29### while building this and ultimately exhausted all 1GB of swap I had.
30### See the documentation for more information. (This was due to using 30### See the documentation for more information. (This was due to using
31### -fmodulo-sched, gcc 4.1.3). 31### -fmodulo-sched, gcc 4.1.3).
32### 32###
33CONFIGURE_ARGS+= --disable-gcc-opts 33CONFIGURE_ARGS+= --disable-gcc-opts
34 34
35INFO_FILES= yes 35INFO_FILES= yes
36MAKE_FILE= makefile 36MAKE_FILE= makefile
37 37
38BUILD_TARGET+= bootstrap 38BUILD_TARGET+= bootstrap
39TEST_TARGET= check 39TEST_TARGET= check
40 40
41CHECK_PORTABILITY_SKIP= prebuilt/*/* 41CHECK_PORTABILITY_SKIP= prebuilt/*/*
42DLOPEN_REQUIRE_PTHREADS=no 42DLOPEN_REQUIRE_PTHREADS=no
43 43
44TEST_TARGET= check 44TEST_TARGET= check
45 45
46.include "../../mk/bsd.prefs.mk" 46.include "../../mk/bsd.prefs.mk"
47 47
48GAMBC_MAKE_FLAGS= prefix=${PREFIX} 48GAMBC_MAKE_FLAGS= prefix=${PREFIX}
49GAMBC_MAKE_FLAGS+= includedir=${PREFIX}/include 49GAMBC_MAKE_FLAGS+= includedir=${PREFIX}/include
50GAMBC_MAKE_FLAGS+= bindir=${PREFIX}/bin 50GAMBC_MAKE_FLAGS+= bindir=${PREFIX}/bin
51GAMBC_MAKE_FLAGS+= infodir=${PREFIX}/${PKGINFODIR} 51GAMBC_MAKE_FLAGS+= infodir=${PREFIX}/${PKGINFODIR}
52GAMBC_MAKE_FLAGS+= libdir=${PREFIX}/lib/ 52GAMBC_MAKE_FLAGS+= libdir=${PREFIX}/lib/
53GAMBC_MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} 53GAMBC_MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}
54GAMBC_MAKE_FLAGS+= docdir=${PREFIX}/share/doc/${PKGBASE} 54GAMBC_MAKE_FLAGS+= docdir=${PREFIX}/share/doc/${PKGBASE}
55GAMBC_MAKE_FLAGS+= infodir=${PREFIX}/${PKGINFODIR} 55GAMBC_MAKE_FLAGS+= infodir=${PREFIX}/${PKGINFODIR}
56GAMBC_MAKE_FLAGS+= emacsdir=${PREFIX}/share/emacs/site-lisp 56GAMBC_MAKE_FLAGS+= emacsdir=${PREFIX}/share/emacs/site-lisp
57 57
58MAKE_FLAGS+= ${GAMBC_MAKE_FLAGS} 58MAKE_FLAGS+= ${GAMBC_MAKE_FLAGS}
59 59
60SUBST_CLASSES+= build 60SUBST_CLASSES+= build
61SUBST_FILES.build= configure 61SUBST_FILES.build= configure
62SUBST_FILES.build+= makefile.in */makefile.in */*/makefile.in 62SUBST_FILES.build+= makefile.in */makefile.in */*/makefile.in
63SUBST_MESSAGE.build= Preparing build-time and installation configuration. 63SUBST_MESSAGE.build= Preparing build-time and installation configuration.
64SUBST_SED.build= -e 's|v${GAMBC_DIST_VERSION}||' 64SUBST_SED.build= -e 's|v${GAMBC_DIST_VERSION}||'
65SUBST_SED.build+= -e 's|@target_vendor@|The NetBSD Foundation, Inc.|g' 65SUBST_SED.build+= -e 's|@target_vendor@|The NetBSD Foundation, Inc.|g'
66SUBST_STAGE.build= pre-configure 66SUBST_STAGE.build= pre-configure
67SUBST_VARS.build+= PACKAGE_SUBDIR PACKAGE_VERSION 67SUBST_VARS.build+= PACKAGE_SUBDIR PACKAGE_VERSION
68SUBST_VARS.build+= PACKAGE_STRING 68SUBST_VARS.build+= PACKAGE_STRING
69 69
70PACKAGE_SUBDIR= # empty 70PACKAGE_SUBDIR= # empty
71PACKAGE_VERSION= ${PKGVERSION} 71PACKAGE_VERSION= ${PKGVERSION}
72PACKAGE_STRING= ${${PKGBASE} ${PKGVERSION}:L} 72PACKAGE_STRING= ${${PKGBASE} ${PKGVERSION}:L}
73 73
74.include "version.mk" 74.include "version.mk"
75 75
 76.include "../../mk/compiler.mk"
 77.if !empty(PKGSRC_COMPILER:Mclang)
 78MAKE_ENV+= CLANG_NO_OPT=-O0
 79.endif
 80
76.include "../../mk/dlopen.buildlink3.mk" 81.include "../../mk/dlopen.buildlink3.mk"
77.include "../../mk/termcap.buildlink3.mk" 82.include "../../mk/termcap.buildlink3.mk"
78.include "../../mk/bsd.pkg.mk" 83.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/lang/gambc/distinfo (switch to unified diff)

--- pkgsrc/lang/gambc/distinfo 2012/04/16 10:19:34 1.5
+++ pkgsrc/lang/gambc/distinfo 2013/12/15 19:39:34 1.6
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1$NetBSD: distinfo,v 1.5 2012/04/16 10:19:34 asau Exp $ 1$NetBSD: distinfo,v 1.6 2013/12/15 19:39:34 joerg Exp $
2 2
3SHA1 (gambc-v4_6_5.tgz) = 16a73446440714aa1985c861aa225d0238528544 3SHA1 (gambc-v4_6_5.tgz) = 16a73446440714aa1985c861aa225d0238528544
4RMD160 (gambc-v4_6_5.tgz) = 2ab84686483c541b1a2e182520740bf8293d266c 4RMD160 (gambc-v4_6_5.tgz) = 2ab84686483c541b1a2e182520740bf8293d266c
5Size (gambc-v4_6_5.tgz) = 10699787 bytes 5Size (gambc-v4_6_5.tgz) = 10699787 bytes
6SHA1 (patch-aa) = 0c87076ccab2483865d269a6a3542e83b76563c5 6SHA1 (patch-aa) = 0c87076ccab2483865d269a6a3542e83b76563c5
7SHA1 (patch-ab) = fb2adfbe600706d291876b858a4144be50c7c6e0 7SHA1 (patch-ab) = fb2adfbe600706d291876b858a4144be50c7c6e0
8SHA1 (patch-examples_iOS_build-gambit-iOS) = 73afbc3aeb7a10c844403ae526539498e9730148 8SHA1 (patch-examples_iOS_build-gambit-iOS) = 73afbc3aeb7a10c844403ae526539498e9730148
9SHA1 (patch-examples_iOS_make-keys) = d556004fe8f87d66c3522a603ee6592047de992a 9SHA1 (patch-examples_iOS_make-keys) = d556004fe8f87d66c3522a603ee6592047de992a
 10SHA1 (patch-gsc_makefile.in) = d9a0ff66425ffc804e397e8720f224fe059d90d6
 11SHA1 (patch-lib_makefile.in) = 3d7628f7b4a4fe268b566e1b927acdbd07fd184e
File Added: pkgsrc/lang/gambc/patches/Attic/patch-gsc_makefile.in
$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
File Added: pkgsrc/lang/gambc/patches/Attic/patch-lib_makefile.in
$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