CVS commit: pkgsrc/x11/qt4-libs

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri May  5 17:38:00 UTC 2017

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

Log Message:
Move C++11 setting before the first inclusion of compiler.mk. Reuse the
results instead of multiply inclusions.


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 pkgsrc/x11/qt4-libs/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/qt4-libs/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/qt4-libs/hacks.mk

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.116 pkgsrc/x11/qt4-libs/Makefile:1.117
--- pkgsrc/x11/qt4-libs/Makefile:1.116  Wed May  3 08:38:46 2017
+++ pkgsrc/x11/qt4-libs/Makefile        Fri May  5 17:38:00 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2017/05/03 08:38:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.117 2017/05/05 17:38:00 joerg Exp $
 
 PKGNAME=       qt4-libs-${QTVERSION}
 PKGREVISION=   6
@@ -28,9 +28,6 @@ CONFIGURE_ARGS+=      -openssl-linked
 
 CONFIGURE_ARGS+=       -iconv
 
-USE_LANGUAGES+=                c++11
-
-.include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 CXXFLAGS+=     -Wno-c++11-narrowing
 .  if empty(MACHINE_PLATFORM:MDarwin-*-*)

Index: pkgsrc/x11/qt4-libs/Makefile.common
diff -u pkgsrc/x11/qt4-libs/Makefile.common:1.41 pkgsrc/x11/qt4-libs/Makefile.common:1.42
--- pkgsrc/x11/qt4-libs/Makefile.common:1.41    Thu Feb 25 08:27:05 2016
+++ pkgsrc/x11/qt4-libs/Makefile.common Fri May  5 17:38:00 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2016/02/25 08:27:05 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.42 2017/05/05 17:38:00 joerg Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -63,6 +63,8 @@ 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"
 
 .if ${OPSYS} == "SunOS"

Index: pkgsrc/x11/qt4-libs/hacks.mk
diff -u pkgsrc/x11/qt4-libs/hacks.mk:1.3 pkgsrc/x11/qt4-libs/hacks.mk:1.4
--- pkgsrc/x11/qt4-libs/hacks.mk:1.3    Mon Dec 15 11:46:36 2014
+++ pkgsrc/x11/qt4-libs/hacks.mk        Fri May  5 17:38:00 2017
@@ -1,10 +1,9 @@
-# $NetBSD: hacks.mk,v 1.3 2014/12/15 11:46:36 jperkin Exp $
+# $NetBSD: hacks.mk,v 1.4 2017/05/05 17:38:00 joerg Exp $
 
 ### [Wed Aug  3 12:18:16 UTC 2011 : tron]
 ### If "qmake" is build with "-O2" or better with "g++" under Mac OS X the
 ### resulting binary will crash. This fixes PR pkg/44716 by Richard Hansen.
 .if ${OPSYS} == "Darwin"
-.  include "../../mk/compiler.mk"
 .  if !empty(CC_VERSION:Mgcc*)
 PKG_HACKS+=            macosx-codegen
 BUILDLINK_TRANSFORM+=  opt:-O[0-9]*:-O1
@@ -16,7 +15,6 @@ BUILDLINK_TRANSFORM+= opt:-O[0-9]*:-O1
 ### when building gui/painting/qdrawhelper_mmx.cpp.
 ### Building with -O1 instead of -O2 seems to work around the problem.
 .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
-.  include "../../mk/compiler.mk"
 .  if !empty(CC_VERSION:Mgcc-4.5.*)
 PKG_HACKS+=            pr46978
 SUBST_CLASSES+=                pr46978