Mon Apr 9 11:29:51 2012 UTC ()
Pullup ticket #3722 - requested by sbd
lang/gcc44: option syntax fix

Revisions pulled up:
- lang/gcc44/options.mk                                         1.9

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	sbd
   Date:		Sun Apr  8 05:04:36 UTC 2012

   Modified Files:
   	pkgsrc/lang/gcc44: options.mk

   Log Message:
   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

   To generate a diff of this commit:
   cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/gcc44/options.mk


(spz)
diff -r1.8 -r1.8.2.1 pkgsrc/lang/gcc44/options.mk
cvs diff -r1.8 -r1.8.2.1 pkgsrc/lang/gcc44/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc44/Attic/options.mk 2012/04/04 22:18:29 1.8
+++ pkgsrc/lang/gcc44/Attic/options.mk 2012/04/09 11:29:51 1.8.2.1
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: options.mk,v 1.8 2012/04/04 22:18:29 sbd Exp $ 1# $NetBSD: options.mk,v 1.8.2.1 2012/04/09 11:29:51 spz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gcc44 3PKG_OPTIONS_VAR= PKG_OPTIONS.gcc44
4PKG_SUPPORTED_OPTIONS= nls gcc-cpp gcc-fortran gcc-java gcc-objc #gcc-ada 4PKG_SUPPORTED_OPTIONS= nls gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada
5PKG_SUGGESTED_OPTIONS= gcc-cpp gcc-fortran gcc-java gcc-objc 5PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-java gcc-objc
6PKG_OPTIONS_LEGACY_OPTS= gcc-c++:gcc-cpp 
7.if ${OPSYS} == "NetBSD" 6.if ${OPSYS} == "NetBSD"
8PKG_SUGGESTED_OPTIONS+= nls 7PKG_SUGGESTED_OPTIONS+= nls
9.endif 8.endif
10 9
11PKG_OPTIONS_LEGACY_VARS+= BUILD_CXX:gcc-cpp 10PKG_OPTIONS_LEGACY_VARS+= BUILD_CXX:gcc-c++
12PKG_OPTIONS_LEGACY_VARS+= BUILD_FORTRAN:gcc-fortran 11PKG_OPTIONS_LEGACY_VARS+= BUILD_FORTRAN:gcc-fortran
13PKG_OPTIONS_LEGACY_VARS+= BUILD_JAVA:gcc-java 12PKG_OPTIONS_LEGACY_VARS+= BUILD_JAVA:gcc-java
14PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:gcc-objc 13PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:gcc-objc
15 14
16.include "../../mk/bsd.options.mk" 15.include "../../mk/bsd.options.mk"
17 16
18### 17###
19### Native Language Support 18### Native Language Support
20### 19###
21.if !empty(PKG_OPTIONS:Mnls) 20.if !empty(PKG_OPTIONS:Mnls)
22CONFIGURE_ARGS+= --enable-nls 21CONFIGURE_ARGS+= --enable-nls
23USE_TOOLS+= msgfmt 22USE_TOOLS+= msgfmt
24.include "../../converters/libiconv/buildlink3.mk" 23.include "../../converters/libiconv/buildlink3.mk"
@@ -26,55 +25,55 @@ USE_TOOLS+= msgfmt @@ -26,55 +25,55 @@ USE_TOOLS+= msgfmt
26.else 25.else
27CONFIGURE_ARGS+= --disable-nls 26CONFIGURE_ARGS+= --disable-nls
28.endif 27.endif
29 28
30### 29###
31### Optional languages 30### Optional languages
32### Ada could be added although there is a bootstrapping issue. See 31### Ada could be added although there is a bootstrapping issue. See
33### ../gcc34-ada for guidance 32### ../gcc34-ada for guidance
34### 33###
35 34
36LANGS= c 35LANGS= c
37 36
38.if !empty(PKG_OPTIONS:Mgcc-java) 37.if !empty(PKG_OPTIONS:Mgcc-java)
39. if empty(PKG_OPTIONS:Mgcc-cpp) 38. if empty(PKG_OPTIONS:Mgcc-c++)
40PKG_OPTIONS+= gcc-cpp 39PKG_OPTIONS+= gcc-c++
41. endif 40. endif
42 41
43LANGS+= java 42LANGS+= java
44REPLACE_PYTHON= libjava/contrib/aot-compile.in 43REPLACE_PYTHON= libjava/contrib/aot-compile.in
45 44
46USE_TOOLS+= unzip zip:run 45USE_TOOLS+= unzip zip:run
47CONFIGURE_ARGS+= --with-system-zlib 46CONFIGURE_ARGS+= --with-system-zlib
48 47
49# ${WRKSRC}/gcc-4.4.1/libjava/contrib/aotcompile.py.in stores the path to 48# ${WRKSRC}/gcc-4.4.1/libjava/contrib/aotcompile.py.in stores the path to
50# a 'make' program so we need to make sure we give it the installed 'make' and not 49# a 'make' program so we need to make sure we give it the installed 'make' and not
51# the tool wrapped one. 50# the tool wrapped one.
52CONFIGURE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake} 51CONFIGURE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake}
53MAKE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake} 52MAKE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake}
54 53
55# fastjar-0.93 from pkgsrc/archivers/fastjar seems to trigger a build 54# fastjar-0.93 from pkgsrc/archivers/fastjar seems to trigger a build
56# failure (seen on NetBSD-5.0/i386) when building java. So in case 55# failure (seen on NetBSD-5.0/i386) when building java. So in case
57# the fastjar package is installed, make sure the configure script 56# the fastjar package is installed, make sure the configure script
58# doesn't pick it up. 57# doesn't pick it up.
59CONFIGURE_ENV+= JAR=no 58CONFIGURE_ENV+= JAR=no
60MAKE_ENV+= JAR=no 59MAKE_ENV+= JAR=no
61MAKE_ENV+= ac_cv_prog_JAR=no 60MAKE_ENV+= ac_cv_prog_JAR=no
62 61
63.include "../../devel/zlib/buildlink3.mk" 62.include "../../devel/zlib/buildlink3.mk"
64.include "../../lang/python/application.mk" 63.include "../../lang/python/application.mk"
65.endif 64.endif
66 65
67.if !empty(PKG_OPTIONS:Mgcc-cpp) 66.if !empty(PKG_OPTIONS:Mgcc-c++)
68LANGS+= c++ 67LANGS+= c++
69USE_TOOLS+= perl 68USE_TOOLS+= perl
70CONFIGURE_ARGS+= --enable-__cxa_atexit 69CONFIGURE_ARGS+= --enable-__cxa_atexit
71.endif 70.endif
72 71
73.if !empty(PKG_OPTIONS:Mgcc-fortran) 72.if !empty(PKG_OPTIONS:Mgcc-fortran)
74LANGS+= fortran 73LANGS+= fortran
75.endif 74.endif
76 75
77.if !empty(PKG_OPTIONS:Mgcc-objc) 76.if !empty(PKG_OPTIONS:Mgcc-objc)
78LANGS+= objc 77LANGS+= objc
79.endif 78.endif
80 79