pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/x11/qt4-libs

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed May 24 14:29:50 UTC 2017

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

Log Message:
Enforce -std=c++98 for the GCC case, GCC 7 defaults to a newer standard
which QT4 has lots of issues with.

To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 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.44 pkgsrc/x11/qt4-libs/Makefile.common:1.45
--- pkgsrc/x11/qt4-libs/Makefile.common:1.44    Mon May  8 15:36:28 2017
+++ pkgsrc/x11/qt4-libs/Makefile.common Wed May 24 14:29:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.44 2017/05/08 15:36:28 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.45 2017/05/24 14:29:50 jperkin Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -66,13 +66,16 @@ SCRIPTS_ENV+=               HOME=${WRKDIR}
 .include "../../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.
+# in lots of ways, so for now just enable it manually for clang, and enforce
+# C++98 for GCC as GCC 7 defaults to C++14.
 .if !empty(PKGSRC_COMPILER:Mclang)
 CXXFLAGS+=     -std=c++11 -Wno-c++11-narrowing
 .  if empty(MACHINE_PLATFORM:MDarwin-*-*)
 .  endif
+.elif !empty(PKGSRC_COMPILER:Mgcc)
+CXXFLAGS+=     -std=c++98
 .if ${OPSYS} == "SunOS"

Home | Main Index | Thread Index | Old Index