Retire CLANG_NO_VALUE_PROPAGATION_PASS. CVP has been fixed in LLVM to

require much less memory.

9 files changed, 7 insertions, 50 deletions

diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile
index b35cce43764..b8f46c52cb0 100644
--- a/cad/klayout/Makefile
+++ b/cad/klayout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/04/08 13:48:52 mef Exp $
+# $NetBSD: Makefile,v 1.9 2017/07/11 19:41:20 joerg Exp $
 
 DISTNAME=	klayout-0.24.10
 CATEGORIES=	cad
@@ -38,8 +38,6 @@ OTHER_BIN= \
 	strmcmp \
 	strmxor
 
-CXXFLAGS+=	${CLANG_NO_VALUE_PROPAGATION_PASS}
-
 do-build:
 	cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} sh build.sh -python python${PYVERSSUFFIX} -qt ${PREFIX}/qt4
 
diff --git a/lang/qore/Makefile b/lang/qore/Makefile
index 8956ba464d7..402ad0ee8d8 100644
--- a/lang/qore/Makefile
+++ b/lang/qore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/06/13 19:23:31 nros Exp $
+# $NetBSD: Makefile,v 1.13 2017/07/11 19:41:20 joerg Exp $
 
 DISTNAME=	qore-0.8.12.10
 CATEGORIES=	lang
@@ -45,9 +45,6 @@ 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/mk/compiler/clang.mk b/mk/compiler/clang.mk
index b791cb41fe2..a8eb69bc26e 100644
--- a/mk/compiler/clang.mk
+++ b/mk/compiler/clang.mk
@@ -1,4 +1,4 @@
-# $NetBSD: clang.mk,v 1.17 2017/05/18 08:14:08 jperkin Exp $
+# $NetBSD: clang.mk,v 1.18 2017/07/11 19:41:20 joerg Exp $
 #
 # This is the compiler definition for the clang compiler.
 #
@@ -79,6 +79,4 @@ 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/print/scribus-qt4/Makefile b/print/scribus-qt4/Makefile
index 546b7acae5f..2378dc04bac 100644
--- a/print/scribus-qt4/Makefile
+++ b/print/scribus-qt4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2017/05/19 13:29:04 prlw1 Exp $
+# $NetBSD: Makefile,v 1.46 2017/07/11 19:41:20 joerg Exp $
 
 DISTNAME=		scribus-1.4.3
 PKGREVISION=		9
@@ -24,11 +24,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 1.4.3
 
 INSTALLATION_DIRS+=	share/pixmaps
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-CMAKE_ARGS+=	-DCLANG_NO_OPT=${CLANG_NO_VALUE_PROPAGATION_PASS:Q}
-.endif
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/resources/icons/scribus.png \
 		${DESTDIR}${PREFIX}/share/pixmaps
diff --git a/print/scribus-qt4/distinfo b/print/scribus-qt4/distinfo
index cec70d3c86a..07a690dc08e 100644
--- a/print/scribus-qt4/distinfo
+++ b/print/scribus-qt4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2016/04/21 09:34:12 jperkin Exp $
+$NetBSD: distinfo,v 1.12 2017/07/11 19:41:20 joerg Exp $
 
 SHA1 (scribus-1.4.3.tar.xz) = 30c111762790e4407c13236bbb4b06f04e907f71
 RMD160 (scribus-1.4.3.tar.xz) = 0c3103536610ca1881d1b65b549886bf9f0d8650
@@ -10,5 +10,3 @@ SHA1 (patch-ai) = 6616ce472b9fa7d8aa9bc3677ac5b25799222816
 SHA1 (patch-ba) = ecddb2304b0ab37fbca41a662773107923df273b
 SHA1 (patch-bb) = c39d78679e0cd17a0fe19a98ecabe7eadfc5b881
 SHA1 (patch-bc) = 1b93d844b40ebe9b425ac7e6fb6b05189c194b6b
-SHA1 (patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt) = b0fa6cabcbcdc46d2a662df313b02f61f4926d2b
-SHA1 (patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt) = 5d7ee482d4afd8acf2c3741f2660539069c5d5cc
diff --git a/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt b/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt
deleted file mode 100644
index cbb9b60f5dd..00000000000
--- a/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt,v 1.1 2013/12/15 19:44:02 joerg Exp $
-
---- scribus/plugins/fileloader/scribus134format/CMakeLists.txt.orig	2013-12-14 22:12:14.000000000 +0000
-+++ scribus/plugins/fileloader/scribus134format/CMakeLists.txt
-@@ -14,6 +14,8 @@ scribus134format_save.cpp
- scribus134formatimpl.cpp
- )
- 
-+SET_SOURCE_FILES_PROPERTIES(scribus134format.cpp PROPERTIES COMPILE_FLAGS "${CLANG_NO_OPT}")
-+
- SET(SCRIBUS_SCR134FORMAT_FL_PLUGIN "scribus134format")
- 
- QT4_WRAP_CPP(SCR134FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR134FORMAT_FL_PLUGIN_MOC_CLASSES})
diff --git a/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt b/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt
deleted file mode 100644
index e181ce0245f..00000000000
--- a/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt,v 1.1 2015/06/17 20:46:51 joerg Exp $
-
---- scribus/plugins/fileloader/scribus13format/CMakeLists.txt.orig	2015-06-17 20:04:41.000000000 +0000
-+++ scribus/plugins/fileloader/scribus13format/CMakeLists.txt
-@@ -13,6 +13,8 @@ scribus13format.cpp
- scribus13formatimpl.cpp
- )
- 
-+SET_SOURCE_FILES_PROPERTIES(scribus13format.cpp PROPERTIES COMPILE_FLAGS "${CLANG_NO_OPT}")
-+
- SET(SCRIBUS_SCR13FORMAT_FL_PLUGIN "scribus13format")
- 
- QT4_WRAP_CPP(SCR13FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR13FORMAT_FL_PLUGIN_MOC_CLASSES})
diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile
index 00a39716ae6..b1cc16b6fbf 100644
--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2016/09/11 16:06:53 taca Exp $
+# $NetBSD: Makefile,v 1.61 2017/07/11 19:41:20 joerg Exp $
 #
 
 DISTNAME=	groonga-6.0.8
@@ -25,8 +25,6 @@ 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/time/fet/Makefile b/time/fet/Makefile
index a03ff6f07dc..34f7e42eef1 100644
--- a/time/fet/Makefile
+++ b/time/fet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/04/22 21:03:59 adam Exp $
+# $NetBSD: Makefile,v 1.22 2017/07/11 19:41:20 joerg Exp $
 
 DISTNAME=	fet-5.25.0
 PKGREVISION=	15
@@ -12,7 +12,6 @@ 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