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 /textproc | |
| parent | 3976212695feabbd27bb2ec036df7e0bddfd4c70 (diff) | |
| download | pkgsrc-5b99812dcc356c047deb6541432c2003597d6d78.tar.gz | |
Convert CXXFLAGS setting C++ standard to USE_LANGUAGES.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/FlightCrew/Makefile | 14 | ||||
| -rw-r--r-- | textproc/php-intl/Makefile | 5 |
2 files changed, 4 insertions, 15 deletions
diff --git a/textproc/FlightCrew/Makefile b/textproc/FlightCrew/Makefile index 1ea0b32d33b..20d5bee93a4 100644 --- a/textproc/FlightCrew/Makefile +++ b/textproc/FlightCrew/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2017/04/30 01:22:01 ryoon Exp $ +# $NetBSD: Makefile,v 1.41 2017/05/03 08:38:45 jperkin Exp $ DISTNAME= FlightCrew-0.7.2-Code PKGNAME= ${DISTNAME:S/-Code//} @@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v3 AND cc-by-sa-v3.0 WRKSRC= ${WRKDIR} -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_CMAKE= yes BUILDLINK_TRANSFORM+= l:BoostParts:boost_date_time:boost_filesystem:boost_regex:boost_system:boost_thread:boost_program_options @@ -36,16 +36,6 @@ SUBST_FILES.d2u+= src/FlightCrew/tests/CMakeLists.txt SUBST_FILES.d2u+= src/FlightCrew/Validators/Opf/ReachabilityAnalysis.cpp SUBST_FILTER_CMD.d2u= ${TR} -d '\r' -.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 - post-extract: ${RM} -rf ${WRKDIR}/src/BoostParts ${WRKDIR}/src/Xerces ${WRKDIR}/src/zlib ${WRKDIR}/src/googlemock diff --git a/textproc/php-intl/Makefile b/textproc/php-intl/Makefile index e87d664ef67..418d6e30e4f 100644 --- a/textproc/php-intl/Makefile +++ b/textproc/php-intl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2017/04/30 22:49:54 maya Exp $ +# $NetBSD: Makefile,v 1.29 2017/05/03 08:38:45 jperkin Exp $ MODNAME= intl CATEGORIES+= textproc @@ -6,8 +6,7 @@ COMMENT= PHP extension for i18n PKGREVISION= 1 LICENSE= php -CXXFLAGS+= -std=c++11 -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_PHP_EXT_PATCHES= yes CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} |