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 /misc | |
| parent | 3976212695feabbd27bb2ec036df7e0bddfd4c70 (diff) | |
| download | pkgsrc-5b99812dcc356c047deb6541432c2003597d6d78.tar.gz | |
Convert CXXFLAGS setting C++ standard to USE_LANGUAGES.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/gelemental/Makefile | 5 | ||||
| -rw-r--r-- | misc/libreoffice/Makefile | 6 | ||||
| -rw-r--r-- | misc/rocs/Makefile | 9 |
3 files changed, 8 insertions, 12 deletions
diff --git a/misc/gelemental/Makefile b/misc/gelemental/Makefile index e1515dab954..7096aac8f18 100644 --- a/misc/gelemental/Makefile +++ b/misc/gelemental/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2017/02/12 06:25:44 ryoon Exp $ +# $NetBSD: Makefile,v 1.33 2017/05/03 08:38:43 jperkin Exp $ # DISTNAME= gelemental-1.2.0 @@ -14,8 +14,7 @@ COMMENT= Periodic table viewer GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config intltool gmake msgfmt -USE_LANGUAGES= c c++ -CXXFLAGS+= -std=c++11 +USE_LANGUAGES= c c++11 PKGCONFIG_OVERRIDE+= data/libelemental.pc.in diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile index 69ae132cf7d..4cfb34f081f 100644 --- a/misc/libreoffice/Makefile +++ b/misc/libreoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.111 2017/05/02 13:37:31 wiz Exp $ +# $NetBSD: Makefile,v 1.112 2017/05/03 08:38:43 jperkin Exp $ VERREL= 5.3.2 VERRC= 2 @@ -14,6 +14,8 @@ HOMEPAGE= http://www.libreoffice.org/ COMMENT= Office productivity suite from The Document Foundation LICENSE= gnu-lgpl-v3 +USE_LANGUAGES= c gnu++11 + SUBST_CLASSES+= use-bash SUBST_STAGE.use-bash= pre-configure SUBST_MESSAGE.use-bash= Using bash for configure script @@ -126,8 +128,6 @@ DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat # and this option will hopefully become unneeded in the future WRAPPER_SKIP_TRANSFORM=yes -USE_LANGUAGES+= c c++ - LDFLAGS+= -lboost_system USE_LIBTOOL= yes diff --git a/misc/rocs/Makefile b/misc/rocs/Makefile index 033fea02826..bc705d8ada6 100644 --- a/misc/rocs/Makefile +++ b/misc/rocs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2017/04/30 01:21:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.45 2017/05/03 08:38:43 jperkin Exp $ DISTNAME= rocs-${_KDE_VERSION} PKGREVISION= 9 @@ -7,12 +7,9 @@ COMMENT= KDE graph theory IDE .include "../../meta-pkgs/kde4/Makefile.kde4" -CMAKE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF +USE_LANGUAGES+= c++11 -.include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Mclang) || !empty(PKGSRC_COMPILER:Mgcc) -CXXFLAGS+= -std=c++11 -.endif +CMAKE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF .include "../../meta-pkgs/kde4/kde4.mk" |