pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11/qt4-libs Revert switch to USE_LANGUAGES for c++11, ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/94e604854991
branches:  trunk
changeset: 362194:94e604854991
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon May 08 15:36:28 2017 +0000

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

diffstat:

 x11/qt4-libs/Makefile.common |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (26 lines):

diff -r 0e3f06d6de14 -r 94e604854991 x11/qt4-libs/Makefile.common
--- a/x11/qt4-libs/Makefile.common      Mon May 08 15:35:16 2017 +0000
+++ b/x11/qt4-libs/Makefile.common      Mon May 08 15:36:28 2017 +0000
@@ -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 @@
 # 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



Home | Main Index | Thread Index | Old Index