CVS commit: pkgsrc/x11/qt4-libs

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May  8 15:36:28 UTC 2017

Modified Files:
        pkgsrc/x11/qt4-libs: Makefile.common

Log Message:
Revert switch to USE_LANGUAGES for c++11, it causes lots of failures when
building with GCC which were missed in the bulk builds due to compiler.mk
inclusion ordering.  Just set it manually for clang as previously for now.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/x11/qt4-libs/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt4-libs/Makefile.common
diff -u pkgsrc/x11/qt4-libs/Makefile.common:1.43 pkgsrc/x11/qt4-libs/Makefile.common:1.44
--- pkgsrc/x11/qt4-libs/Makefile.common:1.43    Sun May  7 21:19:47 2017
+++ pkgsrc/x11/qt4-libs/Makefile.common Mon May  8 15:36:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.43 2017/05/07 21:19:47 joerg Exp $
+# $NetBSD: Makefile.common,v 1.44 2017/05/08 15:36:28 jperkin Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -63,12 +63,13 @@ QMAKE_RANLIB=               ${TRUE}
 # avoid creating a .qt directory in the users home directory
 SCRIPTS_ENV+=          HOME=${WRKDIR}
 
-USE_LANGUAGES+=                c++11
-
 .include "../../mk/compiler.mk"
 
+# We can't set USE_LANGUAGES+=c++11 yet because doing so breaks the GCC build
+# in lots of ways, so for now just enable it manually for clang.
+#
 .if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+=     -Wno-c++11-narrowing
+CXXFLAGS+=     -std=c++11 -Wno-c++11-narrowing
 .  if empty(MACHINE_PLATFORM:MDarwin-*-*)
 CXXFLAGS+=     -D_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC=1
 .  endif