pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/gcc44 Revert the below commit as it has been deci...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f8d6bede2ace
branches: trunk
changeset: 602223:f8d6bede2ace
user: sbd <sbd%pkgsrc.org@localhost>
date: Sun Apr 08 05:04:36 2012 +0000
description:
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:18:30 UTC 2012
Modified Files:
pkgsrc/lang/gcc44: 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.7 -r1.8 pkgsrc/lang/gcc44/options.mk
diffstat:
lang/gcc44/options.mk | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diffs (42 lines):
diff -r 88506b969e34 -r f8d6bede2ace lang/gcc44/options.mk
--- a/lang/gcc44/options.mk Sun Apr 08 04:49:56 2012 +0000
+++ b/lang/gcc44/options.mk Sun Apr 08 05:04:36 2012 +0000
@@ -1,14 +1,13 @@
-# $NetBSD: options.mk,v 1.8 2012/04/04 22:18:29 sbd Exp $
+# $NetBSD: options.mk,v 1.9 2012/04/08 05:04:36 sbd Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gcc44
-PKG_SUPPORTED_OPTIONS= nls gcc-cpp gcc-fortran gcc-java gcc-objc #gcc-ada
-PKG_SUGGESTED_OPTIONS= gcc-cpp gcc-fortran gcc-java 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-java 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
@@ -36,8 +35,8 @@
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
@@ -64,7 +63,7 @@
.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
Home |
Main Index |
Thread Index |
Old Index