From 88d8971affec4aaef3c5b6aec6c4ae130061f3d2 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sun, 15 Dec 2013 19:41:23 +0000
Subject: The Clang 3.4RCs started to use slightly more memory when compiling
 Calculator.cpp, but it was enough to push it over 2GB. So disable
 optimisation for now.

---
 math/qalculate/Makefile                               |  7 ++++++-
 math/qalculate/distinfo                               |  3 ++-
 math/qalculate/patches/patch-libqalculate_Makefile.in | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 math/qalculate/patches/patch-libqalculate_Makefile.in

(limited to 'math/qalculate')

diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 15406492a45..aa68dc49217 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2013/08/21 19:53:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.45 2013/12/15 19:41:23 joerg Exp $
 
 DISTNAME=	libqalculate-0.9.7
 PKGNAME=	qalculate-0.9.7
@@ -31,6 +31,11 @@ CFLAGS.SunOS+=		-D_LCONV_C99
 pre-configure:
 	${RUN} cd ${WRKSRC}; autoconf
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+MAKE_ENV+=	CLANG_NO_OPT=-O0
+.endif
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../math/cln/buildlink3.mk"
diff --git a/math/qalculate/distinfo b/math/qalculate/distinfo
index 000c3883f30..43823cc13b4 100644
--- a/math/qalculate/distinfo
+++ b/math/qalculate/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2010/04/13 17:25:22 drochner Exp $
+$NetBSD: distinfo,v 1.21 2013/12/15 19:41:23 joerg Exp $
 
 SHA1 (libqalculate-0.9.7.tar.gz) = c15f7f3a97995decf62cc964956fc1e374ecd78c
 RMD160 (libqalculate-0.9.7.tar.gz) = cc9e198769bea9731f92d2f3836875c83f715674
@@ -8,3 +8,4 @@ SHA1 (patch-ac) = 98e817d60fc4cd521e7d227ecd330364ec072ecd
 SHA1 (patch-ad) = 8327989bed8dee02c3881f42b981197238609f82
 SHA1 (patch-ae) = 7c9685c578a848cb4e9c55756110d891b9254f2b
 SHA1 (patch-af) = 3bab134f0ca10ecf91252e8211982be767e594e5
+SHA1 (patch-libqalculate_Makefile.in) = 61113a55b69142c6cffa6a9ce754ba4367635275
diff --git a/math/qalculate/patches/patch-libqalculate_Makefile.in b/math/qalculate/patches/patch-libqalculate_Makefile.in
new file mode 100644
index 00000000000..cfe6bb15acc
--- /dev/null
+++ b/math/qalculate/patches/patch-libqalculate_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-libqalculate_Makefile.in,v 1.1 2013/12/15 19:41:23 joerg Exp $
+
+--- libqalculate/Makefile.in.orig	2013-12-14 20:47:49.000000000 +0000
++++ libqalculate/Makefile.in
+@@ -376,8 +376,10 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ 
++CXXFLAGS.Calculator.cc= ${CLANG_NO_OPT}
++
+ .cc.lo:
+-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ${CXXFLAGS.$<}
+ @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- 
cgit v1.2.3