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 | ca7c86855e9536834aeadcc2cb1bc8436ae6ee16 (patch) | |
| tree | 2fa540b3172e66294abe7de0bde1aa824c38da93 /geography | |
| parent | 3ef956f123a6b414874b463757ad4273afe87371 (diff) | |
| download | pkgsrc-ca7c86855e9536834aeadcc2cb1bc8436ae6ee16.tar.gz | |
Convert CXXFLAGS setting C++ standard to USE_LANGUAGES.
Diffstat (limited to 'geography')
| -rw-r--r-- | geography/merkaartor/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/geography/merkaartor/Makefile b/geography/merkaartor/Makefile index c361990334b..28f033c9ebf 100644 --- a/geography/merkaartor/Makefile +++ b/geography/merkaartor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2017/04/30 01:21:41 ryoon Exp $ +# $NetBSD: Makefile,v 1.62 2017/05/03 08:38:42 jperkin Exp $ # DISTNAME= merkaartor-0.17.2 @@ -11,7 +11,7 @@ MAINTAINER= jkunz@NetBSD.org HOMEPAGE= http://www.merkaartor.be/ COMMENT= Merkaartor is an OpenStreetMap mapping program -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes QMAKE= ${QTDIR}/bin/qmake CONFIGURE_ARGS= PREFIX=${PREFIX} NODEBUG=1 OSMARENDER=1 PROJ=1 GDAL=1 \ @@ -32,12 +32,6 @@ do-configure: ${QMAKE} ${CONFIGURE_ARGS} Merkaartor.pro && \ ${MAKE} qmake -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -_WRAP_EXTRA_ARGS.CXX+= -std=c++11 -CWRAPPERS_APPEND.cxx+= -std=c++11 -.endif - .include "../../devel/boost-headers/buildlink3.mk" .include "../../geography/gdal-lib/buildlink3.mk" .include "../../geography/gpsd/buildlink3.mk" |