LLVM's correlated value propagation pass is known to require a lot of

memory and CPU time for certain input. Provide a variable
(CLANG_NO_VALUE_PROPAGATION_PASS) for selectively disabling it in those
places known to trigger it.

10 files changed, 27 insertions, 36 deletions

diff --git a/editors/lyx/Makefile b/editors/lyx/Makefile
index e0c5b754dba..70327047eea 100644
--- a/editors/lyx/Makefile
+++ b/editors/lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2015/01/10 18:13:22 rumko Exp $
+# $NetBSD: Makefile,v 1.45 2015/03/02 19:59:06 joerg Exp $
 
 DISTNAME=		lyx-2.1.2.2
 CATEGORIES=		editors
@@ -186,5 +186,7 @@ SUBST_SED.python+=	-e 's,command("python -tt,command("${PYTHONBIN} -tt,'
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 
+CXXFLAGS+= ${CLANG_NO_VALUE_PROPAGATION_PASS}
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 9e686b683d8..998bb4e3f54 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/11/07 19:39:33 adam Exp $
+# $NetBSD: Makefile,v 1.30 2015/03/02 19:59:06 joerg Exp $
 #
 
 DISTNAME=		scummvm-tools-1.4.0
@@ -19,10 +19,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 INSTALLATION_DIRS=	bin
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-MAKE_ENV+=	CLANG_NO_OPT=-O0
-.endif
+MAKE_ENV+=	CLANG_NO_OPT=${CLANG_NO_VALUE_PROPAGATION_PASS:Q}
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
diff --git a/lang/gambc/Makefile b/lang/gambc/Makefile
index ce9bc0212b3..bdf5e8b5521 100644
--- a/lang/gambc/Makefile
+++ b/lang/gambc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/09/24 23:31:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2015/03/02 19:59:06 joerg Exp $
 #
 
 DISTNAME=	gambc-${GAMBC_DIST_VERSION}
@@ -71,10 +71,7 @@ PACKAGE_STRING=		${${PKGBASE} ${PKGVERSION}:L}
 
 .include "version.mk"
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-MAKE_ENV+=	CLANG_NO_OPT=-O0
-.endif
+MAKE_ENV+=	CLANG_NO_OPT=${CLANG_NO_VALUE_PROPAGATION_PASS:Q}
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
diff --git a/lang/qore/Makefile b/lang/qore/Makefile
index de1b4b49d03..e0f92f2451b 100644
--- a/lang/qore/Makefile
+++ b/lang/qore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/01/16 10:23:24 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2015/03/02 19:59:07 joerg Exp $
 
 DISTNAME=	qore-0.8.11
 PKGREVISION=	2
@@ -42,6 +42,9 @@ post-install:
 .include "application.mk"
 .include "options.mk"
 
+_WRAP_EXTRA_ARGS.CXX+=	${CLANG_NO_VALUE_PROPAGATION_PASS}
+CWRAPPERS_APPEND.cxx+=	${CLANG_NO_VALUE_PROPAGATION_PASS}
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index aa68dc49217..4aca1d4aa1b 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2013/12/15 19:41:23 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2015/03/02 19:59:07 joerg Exp $
 
 DISTNAME=	libqalculate-0.9.7
 PKGNAME=	qalculate-0.9.7
@@ -19,6 +19,8 @@ PKGCONFIG_OVERRIDE=	${WRKSRC}/libqalculate.pc.in
 
 UNLIMIT_RESOURCES=	datasize
 
+MAKE_ENV+=	CLANG_NO_OPT=${CLANG_NO_VALUE_PROPAGATION_PASS:Q}
+
 SUBST_CLASSES+=		pthread
 SUBST_FILES.pthread=	libqalculate.pc.in
 SUBST_SED.pthread+=	-e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
@@ -31,11 +33,6 @@ 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/mk/compiler/clang.mk b/mk/compiler/clang.mk
index b009ee147ef..dec52a13d32 100644
--- a/mk/compiler/clang.mk
+++ b/mk/compiler/clang.mk
@@ -1,4 +1,4 @@
-# $NetBSD: clang.mk,v 1.14 2014/12/03 14:05:25 joerg Exp $
+# $NetBSD: clang.mk,v 1.15 2015/03/02 19:59:07 joerg Exp $
 #
 # This is the compiler definition for the clang compiler.
 #
@@ -72,4 +72,6 @@ CWRAPPERS_APPEND.cc+=	-Qunused-arguments
 _WRAP_EXTRA_ARGS.CXX+=	-Qunused-arguments
 CWRAPPERS_APPEND.cxx+=	-Qunused-arguments
 
+CLANG_NO_VALUE_PROPAGATION_PASS=	-O0
+
 .endif	# COMPILER_CLANG_MK
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 9c1075a52f0..433261a9487 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2015/01/06 14:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2015/03/02 19:59:07 joerg Exp $
 
 DISTNAME=	mkvtoolnix-5.0.1
 PKGREVISION=	24
@@ -29,6 +29,8 @@ INSTALL_ENV+=	SHELL=${SH:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
+CXXFLAGS+=	${CLANG_NO_VALUE_PROPAGATION_PASS}
+
 .if !empty(MAKE_JOBS)
 DRAKE_ARGS=	-j${MAKE_JOBS}
 .else
diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile
index 38fe99d6b5a..6d589aefc43 100644
--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2015/01/29 10:34:14 obache Exp $
+# $NetBSD: Makefile,v 1.53 2015/03/02 19:59:07 joerg Exp $
 #
 
 DISTNAME=	groonga-4.1.1
@@ -27,6 +27,8 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--with-ruby=${RUBY}
 
+CFLAGS+=	${CLANG_NO_VALUE_PROPAGATION_PASS}
+
 PKGCONFIG_OVERRIDE+=	groonga.pc.in
 
 PKG_SYSCONFSUBDIR=	${PKGBASE}
diff --git a/textproc/groonga/hacks.mk b/textproc/groonga/hacks.mk
deleted file mode 100644
index 80ce8d01fb8..00000000000
--- a/textproc/groonga/hacks.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: hacks.mk,v 1.3 2014/05/31 08:30:27 obache Exp $
-
-.if !defined(GROONGA_HACKS_MK)
-GROONGA_HACKS_MK=	# defined
-
-.include "../../mk/compiler.mk"
-
-# Build with optimization. Avoids crash in expr.c
-.if !empty(CC_VERSION:Mclang-*) && !empty(CFLAGS:M-O*)
-PKG_HACKS+=	clang-optimization
-UNLIMIT_RESOURCES+=	datasize
-.endif
-
-.endif
diff --git a/time/fet/Makefile b/time/fet/Makefile
index f9c247b00f5..b8acd9ccaf0 100644
--- a/time/fet/Makefile
+++ b/time/fet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/02/21 23:35:42 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2015/03/02 19:59:07 joerg Exp $
 
 DISTNAME=	fet-5.25.0
 PKGREVISION=	1
@@ -11,6 +11,9 @@ HOMEPAGE=	http://lalescu.ro/liviu/fet/
 COMMENT=	Automatically schedule timetables
 LICENSE=	gnu-gpl-v2
 
+.include "../../mk/bsd.prefs.mk"
+CFLAGS+=	${CLANG_NO_VALUE_PROPAGATION_PASS}
+
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 USE_TOOLS+=	bsdtar