diff options
author | jperkin <jperkin@pkgsrc.org> | 2017-05-03 08:38:38 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2017-05-03 08:38:38 +0000 |
commit | 5b99812dcc356c047deb6541432c2003597d6d78 (patch) | |
tree | 34b2442bcf322c038d08c6a15224a11fa82a1de2 /graphics | |
parent | 3976212695feabbd27bb2ec036df7e0bddfd4c70 (diff) | |
download | pkgsrc-5b99812dcc356c047deb6541432c2003597d6d78.tar.gz |
Convert CXXFLAGS setting C++ standard to USE_LANGUAGES.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/blender/Makefile | 5 | ||||
-rw-r--r-- | graphics/exiv2-organize/Makefile | 13 | ||||
-rw-r--r-- | graphics/gimmage/Makefile | 5 | ||||
-rw-r--r-- | graphics/goocanvasmm/Makefile | 5 | ||||
-rw-r--r-- | graphics/inkscape/Makefile | 5 | ||||
-rw-r--r-- | graphics/lepton/Makefile | 10 | ||||
-rw-r--r-- | graphics/libgnomecanvasmm/Makefile | 5 | ||||
-rw-r--r-- | graphics/opencv-contrib-face/Makefile | 9 | ||||
-rw-r--r-- | graphics/opencv/Makefile | 9 | ||||
-rw-r--r-- | graphics/opencv2/Makefile | 9 |
10 files changed, 20 insertions, 55 deletions
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 88a57f02a46..a86db82618b 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.131 2017/04/30 01:21:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.132 2017/05/03 08:38:42 jperkin Exp $ DISTNAME= blender-2.77a PKGREVISION= 6 @@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2 USE_TOOLS+= gmake sed USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 CMAKE_OPTS+= -DWITH_OPENAL:BOOL=OFF CMAKE_OPTS+= -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX} CMAKE_OPTS+= -DPYTHON_VERSION:STRING=${PYVERSSUFFIX} @@ -32,7 +32,6 @@ CMAKE_OPTS+= -D_OPENGL_LIB_PATH:PATH=${BUILDLINK_PREFIX.MesaLib}/lib CMAKE_OPTS+= -D_OPENGL_INCLUDE_PATH:PATH=${BUILDLINK_PREFIX.MesaLib}/include CMAKE_OPTS+= -DOPENGL_glu_LIBRARY:STRING=GLU -CXXFLAGS+= -std=c++11 CMAKE_OPTS+= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS:Q} PYTHON_VERSIONS_INCOMPATIBLE= 27 diff --git a/graphics/exiv2-organize/Makefile b/graphics/exiv2-organize/Makefile index 33ac025e757..4afe5af5ee3 100644 --- a/graphics/exiv2-organize/Makefile +++ b/graphics/exiv2-organize/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.31 2017/04/30 01:21:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.32 2017/05/03 08:38:42 jperkin Exp $ PKGREVISION= 3 .include "../../graphics/exiv2/Makefile.common" PKGNAME= ${DISTNAME:S/exiv2/exiv2-organize/} +USE_LANGUAGES+= c++0x USE_TOOLS+= pkg-config BUILD_DIRS= contrib/organize INSTALLATION_DIRS= bin @@ -13,16 +14,6 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/contrib/organize/organize \ ${DESTDIR}${PREFIX}/bin/exiv2-organize -.include "../../mk/compiler.mk" -# GCC 4.4 and above needs this -.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*) -_WRAP_EXTRA_ARGS.CXX+= -std=c++0x -CWRAPPERS_APPEND.cxx+= -std=c++0x -.elif !empty(PKGSRC_COMPILER:Mclang) -_WRAP_EXTRA_ARGS.CXX+= -std=c++11 -CWRAPPERS_APPEND.cxx+= -std=c++11 -.endif - .include "../../graphics/exiv2/buildlink3.mk" .include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" diff --git a/graphics/gimmage/Makefile b/graphics/gimmage/Makefile index 1a447add8d6..0abd5fb6887 100644 --- a/graphics/gimmage/Makefile +++ b/graphics/gimmage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2017/04/30 01:21:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.38 2017/05/03 08:38:42 jperkin Exp $ # DISTNAME= gimmage-0.2.3 @@ -12,8 +12,7 @@ COMMENT= GTKMM-based image viewing program GNU_CONFIGURE= yes INSTALLATION_DIRS= share/doc/gimmage -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_PKGLOCALEDIR= yes USE_TOOLS+= pkg-config diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile index 5c99516ae33..ce97f11a30f 100644 --- a/graphics/goocanvasmm/Makefile +++ b/graphics/goocanvasmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2017/02/12 06:25:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.42 2017/05/03 08:38:42 jperkin Exp $ # DISTNAME= goocanvasmm-0.15.4 @@ -14,8 +14,7 @@ LICENSE= gnu-lgpl-v2.1 GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config perl -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 PKGCONFIG_OVERRIDE+= goocanvas/goocanvasmm.pc.in diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 557358d1786..553f68aeac8 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.147 2017/05/02 13:37:31 wiz Exp $ +# $NetBSD: Makefile,v 1.148 2017/05/03 08:38:42 jperkin Exp $ DISTNAME= inkscape-0.92.1 PKGREVISION= 4 @@ -20,10 +20,9 @@ DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml EXTRACT_USING= bsdtar GCC_REQD+= 4.5.2 -CXXFLAGS+= -std=c++11 USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= intltool msgfmt msgmerge perl:run pkg-config diff --git a/graphics/lepton/Makefile b/graphics/lepton/Makefile index 9b9970c1f80..2cbb4f6b4d6 100644 --- a/graphics/lepton/Makefile +++ b/graphics/lepton/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/07/19 06:04:30 agc Exp $ +# $NetBSD: Makefile,v 1.3 2017/05/03 08:38:42 jperkin Exp $ DISTNAME= lepton-1.2.1 CATEGORIES= graphics @@ -12,15 +12,9 @@ LICENSE= modified-bsd GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_LANGUAGES+= c c++ +USE_LANGUAGES+= c c++11 USE_TOOLS+= autoconf autoreconf automake gmake makeinfo -.include "../../mk/compiler.mk" - -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - AUTO_MKDIRS= yes pre-configure: diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile index c0775ea1f8d..fc7c0c0dad5 100644 --- a/graphics/libgnomecanvasmm/Makefile +++ b/graphics/libgnomecanvasmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2017/02/12 06:24:45 ryoon Exp $ +# $NetBSD: Makefile,v 1.43 2017/05/03 08:38:42 jperkin Exp $ DISTNAME= libgnomecanvasmm-2.26.0 PKGREVISION= 25 @@ -10,8 +10,7 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://gtkmm.sourceforge.net/ COMMENT= C++ bindings for libgnomecanvas -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gm4 gmake pkg-config diff --git a/graphics/opencv-contrib-face/Makefile b/graphics/opencv-contrib-face/Makefile index 1a0b95f0230..1c81228d755 100644 --- a/graphics/opencv-contrib-face/Makefile +++ b/graphics/opencv-contrib-face/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2017/03/28 11:29:50 markd Exp $ +# $NetBSD: Makefile,v 1.10 2017/05/03 08:38:43 jperkin Exp $ DISTNAME= opencv_contrib-3.2.0 PKGNAME= ${DISTNAME:S/_contrib/-contrib-face/} @@ -15,7 +15,7 @@ LICENSE= modified-bsd DISTFILES= ${DEFAULT_DISTFILES} opencv-${PKGVERSION_NOREV}.zip USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config @@ -29,11 +29,6 @@ PATCHDIR= ${.CURDIR}/../../graphics/opencv/patches CMAKE_ARGS+= -D WITH_FFMPEG=OFF CMAKE_ARGS+= -D BUILD_DOCS=OFF -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - # jasper uses SIZE_MAX and friends in its headers. CXXFLAGS+= -D__STDC_LIMIT_MACROS diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index fad3664816f..310c06f38f1 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2017/03/16 21:59:13 prlw1 Exp $ +# $NetBSD: Makefile,v 1.71 2017/05/03 08:38:43 jperkin Exp $ DISTNAME= opencv-3.2.0 CATEGORIES= graphics devel @@ -11,7 +11,7 @@ COMMENT= Library for computer vision problems LICENSE= modified-bsd USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config @@ -30,11 +30,6 @@ CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.* .include "options.mk" -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN} CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib} CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=NO diff --git a/graphics/opencv2/Makefile b/graphics/opencv2/Makefile index be529dfd6fb..2a1aebf6a85 100644 --- a/graphics/opencv2/Makefile +++ b/graphics/opencv2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2017/02/12 06:25:30 ryoon Exp $ +# $NetBSD: Makefile,v 1.10 2017/05/03 08:38:43 jperkin Exp $ DISTNAME= opencv-2.4.11 PKGREVISION= 6 @@ -12,7 +12,7 @@ COMMENT= Library for computer vision problems LICENSE= modified-bsd USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config @@ -35,11 +35,6 @@ CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.* .include "options.mk" -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib} CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=NO |