CVS commit: pkgsrc/x11/qt4-libs

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun May  7 21:19:47 UTC 2017

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

Log Message:
Move compiler flags into Makefile.common.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/x11/qt4-libs/Makefile
cvs rdiff -u -r1.42 -r1.43 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
diff -u pkgsrc/x11/qt4-libs/Makefile:1.117 pkgsrc/x11/qt4-libs/Makefile:1.118
--- pkgsrc/x11/qt4-libs/Makefile:1.117  Fri May  5 17:38:00 2017
+++ pkgsrc/x11/qt4-libs/Makefile        Sun May  7 21:19:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2017/05/05 17:38:00 joerg Exp $
+# $NetBSD: Makefile,v 1.118 2017/05/07 21:19:47 joerg Exp $
 
 PKGNAME=       qt4-libs-${QTVERSION}
 PKGREVISION=   6
@@ -28,13 +28,6 @@ CONFIGURE_ARGS+=     -openssl-linked
 
 CONFIGURE_ARGS+=       -iconv
 
-.if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+=     -Wno-c++11-narrowing
-.  if empty(MACHINE_PLATFORM:MDarwin-*-*)
-CXXFLAGS+=     -D_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC=1
-.  endif
-.endif
-
 INSTALLATION_DIRS=     lib/pkgconfig
 INSTALLATION_DIRS+=    ${QTPREFIX}/bin
 INSTALLATION_DIRS+=    ${QTPREFIX}/imports/Qt/labs/folderlistmodel

Index: pkgsrc/x11/qt4-libs/Makefile.common
diff -u pkgsrc/x11/qt4-libs/Makefile.common:1.42 pkgsrc/x11/qt4-libs/Makefile.common:1.43
--- pkgsrc/x11/qt4-libs/Makefile.common:1.42    Fri May  5 17:38:00 2017
+++ pkgsrc/x11/qt4-libs/Makefile.common Sun May  7 21:19:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2017/05/05 17:38:00 joerg Exp $
+# $NetBSD: Makefile.common,v 1.43 2017/05/07 21:19:47 joerg Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -67,6 +67,13 @@ USE_LANGUAGES+=              c++11
 
 .include "../../mk/compiler.mk"
 
+.if !empty(PKGSRC_COMPILER:Mclang)
+CXXFLAGS+=     -Wno-c++11-narrowing
+.  if empty(MACHINE_PLATFORM:MDarwin-*-*)
+CXXFLAGS+=     -D_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC=1
+.  endif
+.endif
+
 .if ${OPSYS} == "SunOS"
 .  if !empty(CC_VERSION:Mgcc*)
 .    if ${ABI:U} == "64"