[pkgsrc/trunk]: pkgsrc/math/qalculate The Clang 3.4RCs started to use slightl...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb5574f00367
branches:  trunk
changeset: 627808:cb5574f00367
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Dec 15 19:41:23 2013 +0000

description:
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.

diffstat:

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

diffs (55 lines):

diff -r e4cfabeb2bb7 -r cb5574f00367 math/qalculate/Makefile
--- a/math/qalculate/Makefile   Sun Dec 15 19:40:03 2013 +0000
+++ b/math/qalculate/Makefile   Sun Dec 15 19:41:23 2013 +0000
@@ -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 @@
 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 -r e4cfabeb2bb7 -r cb5574f00367 math/qalculate/distinfo
--- a/math/qalculate/distinfo   Sun Dec 15 19:40:03 2013 +0000
+++ b/math/qalculate/distinfo   Sun Dec 15 19:41:23 2013 +0000
@@ -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-ad) = 8327989bed8dee02c3881f42b981197238609f82
 SHA1 (patch-ae) = 7c9685c578a848cb4e9c55756110d891b9254f2b
 SHA1 (patch-af) = 3bab134f0ca10ecf91252e8211982be767e594e5
+SHA1 (patch-libqalculate_Makefile.in) = 61113a55b69142c6cffa6a9ce754ba4367635275
diff -r e4cfabeb2bb7 -r cb5574f00367 math/qalculate/patches/patch-libqalculate_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/qalculate/patches/patch-libqalculate_Makefile.in     Sun Dec 15 19:41:23 2013 +0000
@@ -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@