pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11/qt4-libs Move compiler flags into Makefile.common.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4705b7606d79
branches:  trunk
changeset: 362175:4705b7606d79
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun May 07 21:19:47 2017 +0000

description:
Move compiler flags into Makefile.common.

diffstat:

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

diffs (46 lines):

diff -r 70d854974cec -r 4705b7606d79 x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile     Sun May 07 16:10:47 2017 +0000
+++ b/x11/qt4-libs/Makefile     Sun May 07 21:19:47 2017 +0000
@@ -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+=       -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
diff -r 70d854974cec -r 4705b7606d79 x11/qt4-libs/Makefile.common
--- a/x11/qt4-libs/Makefile.common      Sun May 07 16:10:47 2017 +0000
+++ b/x11/qt4-libs/Makefile.common      Sun May 07 21:19:47 2017 +0000
@@ -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 @@
 
 .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"



Home | Main Index | Thread Index | Old Index