Tue Jul 12 18:05:58 2011 UTC ()
Use the options framework to select which language frontends to build
besides C. Just as before, the default is to build c++, java, fortran
and objc. Option java implies option c++.


(hans)
diff -r1.22 -r1.23 pkgsrc/lang/gcc44/Makefile
diff -r1.3 -r1.4 pkgsrc/lang/gcc44/options.mk
cvs diff -r1.22 -r1.23 pkgsrc/lang/gcc44/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc44/Attic/Makefile 2011/07/11 23:26:32 1.22
+++ pkgsrc/lang/gcc44/Attic/Makefile 2011/07/12 18:05:58 1.23
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.22 2011/07/11 23:26:32 wiz Exp $ 1# $NetBSD: Makefile,v 1.23 2011/07/12 18:05:58 hans Exp $
2 2
3DISTNAME= gcc-${GCC_VERSION} 3DISTNAME= gcc-${GCC_VERSION}
4PKGNAME= gcc44-${GCC_VERSION} 4PKGNAME= gcc44-${GCC_VERSION}
 5PKGREVISION= 1
5CATEGORIES= lang 6CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/} 7MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= blair.sadewitz@gmail.com 10MAINTAINER= blair.sadewitz@gmail.com
10HOMEPAGE= http://gcc.gnu.org/ 11HOMEPAGE= http://gcc.gnu.org/
11COMMENT= GNU Compiler Collection 4.4 12COMMENT= GNU Compiler Collection 4.4
12LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 13LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16USE_TOOLS+= awk:run bash:run perl chmod \ 17USE_TOOLS+= awk:run bash:run perl chmod \
17 gmake:run makeinfo bison flex gm4 \ 18 gmake:run makeinfo bison flex gm4 \
@@ -58,58 +59,26 @@ CONFIGURE_ARGS+= --with-gnu-as --with-as @@ -58,58 +59,26 @@ CONFIGURE_ARGS+= --with-gnu-as --with-as
58 59
59REPLACE_BASH+= contrib/dg-cmp-results.sh 60REPLACE_BASH+= contrib/dg-cmp-results.sh
60REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-patchlist 61REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-patchlist
61REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update 62REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update
62REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update-fix 63REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update-fix
63REPLACE_BASH+= contrib/reghunt/bin/reg-hunt 64REPLACE_BASH+= contrib/reghunt/bin/reg-hunt
64REPLACE_BASH+= contrib/reghunt/bin/reg-test 65REPLACE_BASH+= contrib/reghunt/bin/reg-test
65REPLACE_BASH+= contrib/reghunt/date_based/reg_periodic 66REPLACE_BASH+= contrib/reghunt/date_based/reg_periodic
66REPLACE_BASH+= contrib/reghunt/date_based/reg_search 67REPLACE_BASH+= contrib/reghunt/date_based/reg_search
67REPLACE_BASH+= gcc/dbgcnt.def 68REPLACE_BASH+= gcc/dbgcnt.def
68REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests 69REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests
69REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen 70REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen
70 71
71# Optional languages - change as required 
72# Ada could be added although there is a bootstrapping issue. See 
73# ../gcc34-ada for guidance 
74BUILD_DEFS+= BUILD_CXX BUILD_FORTRAN BUILD_JAVA BUILD_OBJC 
75BUILD_CXX?= YES 
76BUILD_FORTRAN?= YES 
77BUILD_JAVA?= YES 
78BUILD_OBJC?= YES 
79 
80LANGS= c 
81 
82#.if !empty(BUILD_CXX:M[aA][dD][aA]) 
83#LANGS+= ada 
84#.endif 
85 
86.if !empty(BUILD_CXX:M[Yy][Ee][Ss]) 
87LANGS+= c++ 
88.endif 
89 
90.if !empty(BUILD_FORTRAN:M[Yy][Ee][Ss]) 
91LANGS+= fortran 
92.endif 
93 
94.if !empty(BUILD_JAVA:M[Yy][Ee][Ss]) 
95LANGS+= java 
96REPLACE_PYTHON= libjava/contrib/aot-compile.py.in 
97.endif 
98 
99.if !empty(BUILD_OBJC:M[Yy][Ee][Ss]) 
100LANGS+= objc 
101.endif 
102 
103CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q} 72CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q}
104CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} 73CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
105CONFIGURE_ARGS+= --with-system-zlib 74CONFIGURE_ARGS+= --with-system-zlib
106CONFIGURE_ARGS+= --enable-shared 75CONFIGURE_ARGS+= --enable-shared
107CONFIGURE_ARGS+= --enable-__cxa_atexit 76CONFIGURE_ARGS+= --enable-__cxa_atexit
108CONFIGURE_ARGS+= --enable-long-long 77CONFIGURE_ARGS+= --enable-long-long
109CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} 78CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
110CONFIGURE_ARGS+= --disable-libssp 79CONFIGURE_ARGS+= --disable-libssp
111CONFIGURE_ARGS+= --enable-threads=posix 80CONFIGURE_ARGS+= --enable-threads=posix
112CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp} 81CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}
113CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr} 82CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr}
114 83
115CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL} 84CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL}
cvs diff -r1.3 -r1.4 pkgsrc/lang/gcc44/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc44/Attic/options.mk 2011/04/14 19:38:13 1.3
+++ pkgsrc/lang/gcc44/Attic/options.mk 2011/07/12 18:05:58 1.4
@@ -1,22 +1,59 @@ @@ -1,22 +1,59 @@
1# $NetBSD: options.mk,v 1.3 2011/04/14 19:38:13 hans Exp $ 1# $NetBSD: options.mk,v 1.4 2011/07/12 18:05:58 hans Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gcc44 3PKG_OPTIONS_VAR= PKG_OPTIONS.gcc44
4PKG_SUPPORTED_OPTIONS= nls 4PKG_SUPPORTED_OPTIONS= nls c++ fortran java objc #ada
5PKG_SUGGESTED_OPTIONS= 5PKG_SUGGESTED_OPTIONS= c++ fortran java objc
6.if ${OPSYS} == "NetBSD" 6.if ${OPSYS} == "NetBSD"
7PKG_SUGGESTED_OPTIONS+= nls 7PKG_SUGGESTED_OPTIONS+= nls
8.endif 8.endif
9 9
 10PKG_OPTIONS_LEGACY_VARS+= BUILD_CXX:c++
 11PKG_OPTIONS_LEGACY_VARS+= BUILD_FORTRAN:fortran
 12PKG_OPTIONS_LEGACY_VARS+= BUILD_JAVA:java
 13PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:objc
 14
10.include "../../mk/bsd.options.mk" 15.include "../../mk/bsd.options.mk"
11 16
12### 17###
13### Native Language Support 18### Native Language Support
14### 19###
15.if !empty(PKG_OPTIONS:Mnls) 20.if !empty(PKG_OPTIONS:Mnls)
16CONFIGURE_ARGS+= --enable-nls 21CONFIGURE_ARGS+= --enable-nls
17USE_TOOLS+= msgfmt 22USE_TOOLS+= msgfmt
18.include "../../converters/libiconv/buildlink3.mk" 23.include "../../converters/libiconv/buildlink3.mk"
19.include "../../devel/gettext-lib/buildlink3.mk" 24.include "../../devel/gettext-lib/buildlink3.mk"
20.else 25.else
21CONFIGURE_ARGS+= --disable-nls 26CONFIGURE_ARGS+= --disable-nls
22.endif 27.endif
 28
 29###
 30### Optional languages
 31### Ada could be added although there is a bootstrapping issue. See
 32### ../gcc34-ada for guidance
 33###
 34
 35LANGS= c
 36
 37.if !empty(PKG_OPTIONS:Mjava)
 38. if empty(PKG_OPTIONS:Mc++)
 39PKG_OPTIONS+= c++
 40. endif
 41LANGS+= java
 42REPLACE_PYTHON= libjava/contrib/aot-compile.in
 43.endif
 44
 45.if !empty(PKG_OPTIONS:Mc++)
 46LANGS+= c++
 47.endif
 48
 49.if !empty(PKG_OPTIONS:Mfortran)
 50LANGS+= fortran
 51.endif
 52
 53.if !empty(PKG_OPTIONS:Mobjc)
 54LANGS+= objc
 55.endif
 56
 57#.if !empty(PKG_OPTIONS:Mada)
 58#LANGS+= ada
 59#.endif