diff options
| author | sbd <sbd@pkgsrc.org> | 2012-04-08 05:04:46 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-04-08 05:04:46 +0000 |
| commit | e378c17fa7a76d18d66dc78e9a92e82cc3285954 (patch) | |
| tree | c358c2f399e91b1f0632b6ffcc2e37725fabab3a | |
| parent | 795ca317902a3dd6446c5bfa9b7c47f51a5c0347 (diff) | |
| download | pkgsrc-e378c17fa7a76d18d66dc78e9a92e82cc3285954.tar.gz | |
Revert the below commit as it has been decided that plus (+) characters are
allowed in option names (pkglint has been updated).
---
Module Name: pkgsrc
Committed By: sbd
Date: Wed Apr 4 22:20:37 UTC 2012
Modified Files:
pkgsrc/lang/gcc46: options.mk
Log Message:
Rename option "gcc-c++" to "gcc-cpp" (with legacy support) as pkglint
complains with: "gcc-c++" is not a valid option name.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc46/options.mk
| -rw-r--r-- | lang/gcc46/options.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lang/gcc46/options.mk b/lang/gcc46/options.mk index 913c193492c..fa3ddddfe18 100644 --- a/lang/gcc46/options.mk +++ b/lang/gcc46/options.mk @@ -1,14 +1,13 @@ -# $NetBSD: options.mk,v 1.5 2012/04/04 22:20:37 sbd Exp $ +# $NetBSD: options.mk,v 1.6 2012/04/08 05:04:46 sbd Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gcc46 -PKG_SUPPORTED_OPTIONS= nls gcc-cpp gcc-fortran gcc-java gcc-objc #gcc-ada -PKG_SUGGESTED_OPTIONS= gcc-cpp gcc-fortran gcc-objc -PKG_OPTIONS_LEGACY_OPTS= gcc-c++:gcc-cpp +PKG_SUPPORTED_OPTIONS= nls gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada +PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc .if ${OPSYS} == "NetBSD" PKG_SUGGESTED_OPTIONS+= nls .endif -PKG_OPTIONS_LEGACY_VARS+= BUILD_CXX:gcc-cpp +PKG_OPTIONS_LEGACY_VARS+= BUILD_CXX:gcc-c++ PKG_OPTIONS_LEGACY_VARS+= BUILD_FORTRAN:gcc-fortran PKG_OPTIONS_LEGACY_VARS+= BUILD_JAVA:gcc-java PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:gcc-objc @@ -37,8 +36,8 @@ CONFIGURE_ARGS+= --disable-nls LANGS= c .if !empty(PKG_OPTIONS:Mgcc-java) -. if empty(PKG_OPTIONS:Mgcc-cpp) -PKG_OPTIONS+= gcc-cpp +. if empty(PKG_OPTIONS:Mgcc-c++) +PKG_OPTIONS+= gcc-c++ . endif LANGS+= java @@ -65,7 +64,7 @@ MAKE_ENV+= ac_cv_prog_JAR=no .include "../../lang/python/application.mk" .endif -.if !empty(PKG_OPTIONS:Mgcc-cpp) +.if !empty(PKG_OPTIONS:Mgcc-c++) LANGS+= c++ USE_TOOLS+= perl CONFIGURE_ARGS+= --enable-__cxa_atexit |