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 /databases | |
| parent | 3976212695feabbd27bb2ec036df7e0bddfd4c70 (diff) | |
| download | pkgsrc-5b99812dcc356c047deb6541432c2003597d6d78.tar.gz | |
Convert CXXFLAGS setting C++ standard to USE_LANGUAGES.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql-workbench/Makefile | 9 | ||||
| -rw-r--r-- | databases/soci/Makefile | 8 | ||||
| -rw-r--r-- | databases/sqlrelay-nodejs/Makefile | 6 |
3 files changed, 7 insertions, 16 deletions
diff --git a/databases/mysql-workbench/Makefile b/databases/mysql-workbench/Makefile index f5b873f656e..b8a04784f90 100644 --- a/databases/mysql-workbench/Makefile +++ b/databases/mysql-workbench/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2017/04/22 21:03:27 adam Exp $ +# $NetBSD: Makefile,v 1.57 2017/05/03 08:38:39 jperkin Exp $ DISTNAME= mysql-workbench-gpl-5.2.33b-src PKGNAME= ${DISTNAME:S/-gpl//:S/b-src$//} @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2 WRKSRC= ${WRKDIR}/${DISTNAME:S/b-src$/-src/} -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_LIBTOOL= yes USE_TOOLS+= bash gmake pkg-config GNU_CONFIGURE= yes @@ -51,11 +51,6 @@ SUBST_SED.osx-gl= -e 's,-lGL,-framework OpenGL,g' .include "../../graphics/MesaLib/buildlink3.mk" .endif -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) -CXXFLAGS+= -std=c++11 -.endif - .include "../../archivers/libzip/buildlink3.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/boost-headers/buildlink3.mk" diff --git a/databases/soci/Makefile b/databases/soci/Makefile index a3e58176705..66dfeb6eda2 100644 --- a/databases/soci/Makefile +++ b/databases/soci/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2017/04/30 01:21:31 ryoon Exp $ +# $NetBSD: Makefile,v 1.21 2017/05/03 08:38:39 jperkin Exp $ # DISTNAME= soci-3.2.2 @@ -12,13 +12,9 @@ COMMENT= C++ database access library LICENSE= boost-license USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c gnu++11 CMAKE_ARGS+= -DSOCI_LIBDIR=lib - -.include "../../mk/bsd.prefs.mk" - -CXXFLAGS.Cygwin+= -std=gnu++11 CMAKE_ARGS+= -DCMAKE_CXX_FLAGS=${CXXFLAGS:Q} .include "options.mk" diff --git a/databases/sqlrelay-nodejs/Makefile b/databases/sqlrelay-nodejs/Makefile index 583c5a18d4f..520b6101ea3 100644 --- a/databases/sqlrelay-nodejs/Makefile +++ b/databases/sqlrelay-nodejs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2017/04/30 01:21:31 ryoon Exp $ +# $NetBSD: Makefile,v 1.10 2017/05/03 08:38:39 jperkin Exp $ PKGNAME= ${DISTNAME:S/sqlrelay/sqlrelay-nodejs/} PKGREVISION= 1 @@ -6,6 +6,8 @@ COMMENT= node.js API for SQL Relay .include "../../databases/sqlrelay/Makefile.common" +USE_LANGUAGES+= c++11 + DEPENDS+= nodejs-[0-9]*:../../lang/nodejs LICENSE= gnu-lgpl-v2 @@ -18,8 +20,6 @@ CONFIGURE_ARGS+= --disable-mysql BUILD_DIRS= src/api/nodejs -CXXFLAGS+= -std=c++11 - # Benign reference inside an object file CHECK_WRKREF_SKIP+= lib/node_modules/sqlrelay/sqlrelay.node |