Thu Oct 13 10:54:24 2011 UTC ()
Use options framework for language support.


(hans)
diff -r1.6 -r1.7 pkgsrc/lang/gcc46/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/gcc46/options.mk
cvs diff -r1.6 -r1.7 pkgsrc/lang/gcc46/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc46/Attic/Makefile 2011/10/13 10:43:10 1.6
+++ pkgsrc/lang/gcc46/Attic/Makefile 2011/10/13 10:54:24 1.7
@@ -1,34 +1,32 @@ @@ -1,34 +1,32 @@
1# $NetBSD: Makefile,v 1.6 2011/10/13 10:43:10 hans Exp $ 1# $NetBSD: Makefile,v 1.7 2011/10/13 10:54:24 hans Exp $
2 2
3DISTNAME= gcc-${GCC_VERSION} 3DISTNAME= gcc-${GCC_VERSION}
4PKGNAME= gcc46-${GCC_VERSION} 4PKGNAME= gcc46-${GCC_VERSION}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/} 7MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= kuehro@gmx.de 10MAINTAINER= kuehro@gmx.de
11HOMEPAGE= http://gcc.gnu.org/ 11HOMEPAGE= http://gcc.gnu.org/
12COMMENT= GNU Compiler Collection 4.6 12COMMENT= GNU Compiler Collection 4.6
13LICENSE= 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
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17USE_TOOLS+= awk:run bash:run perl chmod \ 17USE_TOOLS+= awk:run bash:run chmod \
18 gmake:run makeinfo bison flex gm4 \ 18 gmake:run makeinfo bison flex gm4 \
19 sed:run unzip 19 sed:run
20 
21DEPENDS+= zip-[0-9]*:../../archivers/zip 
22 20
23GCC_VERSION= 4.6.1 21GCC_VERSION= 4.6.1
24 22
25GCC_SUBPREFIX= gcc46 23GCC_SUBPREFIX= gcc46
26GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} 24GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
27FILES_SUBST+= PKGNAME=${PKGNAME} 25FILES_SUBST+= PKGNAME=${PKGNAME}
28MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX} 26MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX}
29 27
30 28
31# To avoid GNU surprises 29# To avoid GNU surprises
32CONFIG_SHELL= ${TOOLS_PATH.bash} 30CONFIG_SHELL= ${TOOLS_PATH.bash}
33 31
34NOT_FOR_PLATFORM= Interix-*-* 32NOT_FOR_PLATFORM= Interix-*-*
@@ -60,98 +58,49 @@ CONFIGURE_ARGS+= --with-gnu-as --with-as @@ -60,98 +58,49 @@ CONFIGURE_ARGS+= --with-gnu-as --with-as
60 58
61REPLACE_BASH+= contrib/dg-cmp-results.sh 59REPLACE_BASH+= contrib/dg-cmp-results.sh
62REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-patchlist 60REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-patchlist
63REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update 61REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update
64REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update-fix 62REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update-fix
65REPLACE_BASH+= contrib/reghunt/bin/reg-hunt 63REPLACE_BASH+= contrib/reghunt/bin/reg-hunt
66REPLACE_BASH+= contrib/reghunt/bin/reg-test 64REPLACE_BASH+= contrib/reghunt/bin/reg-test
67REPLACE_BASH+= contrib/reghunt/date_based/reg_periodic 65REPLACE_BASH+= contrib/reghunt/date_based/reg_periodic
68REPLACE_BASH+= contrib/reghunt/date_based/reg_search 66REPLACE_BASH+= contrib/reghunt/date_based/reg_search
69REPLACE_BASH+= gcc/dbgcnt.def 67REPLACE_BASH+= gcc/dbgcnt.def
70REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests 68REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests
71REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen 69REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen
72 70
73# Optional languages - change as required 
74# Ada could be added although there is a bootstrapping issue. See 
75# ../gcc34-ada for guidance 
76BUILD_DEFS+= BUILD_CXX BUILD_FORTRAN BUILD_JAVA BUILD_OBJC 
77BUILD_CXX?= YES 
78BUILD_FORTRAN?= YES 
79BUILD_JAVA?= NO 
80BUILD_OBJC?= YES 
81 
82LANGS= c 
83 
84#.if !empty(BUILD_CXX:M[aA][dD][aA]) 
85#LANGS+= ada 
86#.endif 
87 
88.if !empty(BUILD_CXX:M[Yy][Ee][Ss]) 
89LANGS+= c++ 
90.endif 
91 
92.if !empty(BUILD_FORTRAN:M[Yy][Ee][Ss]) 
93LANGS+= fortran 
94.endif 
95 
96.if !empty(BUILD_JAVA:M[Yy][Ee][Ss]) 
97LANGS+= java 
98.endif 
99 
100.if !empty(BUILD_OBJC:M[Yy][Ee][Ss]) 
101LANGS+= objc 
102.endif 
103 
104 71
105CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q} 72CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q}
106CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} 73CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
107CONFIGURE_ARGS+= --with-system-zlib 
108CONFIGURE_ARGS+= --enable-shared 74CONFIGURE_ARGS+= --enable-shared
109CONFIGURE_ARGS+= --enable-__cxa_atexit 
110CONFIGURE_ARGS+= --enable-long-long 75CONFIGURE_ARGS+= --enable-long-long
111CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} 76CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
112CONFIGURE_ARGS+= --enable-libssp 77CONFIGURE_ARGS+= --enable-libssp
113CONFIGURE_ARGS+= --enable-threads=posix 78CONFIGURE_ARGS+= --enable-threads=posix
114CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp} 79CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}
115CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr} 80CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr}
116CONFIGURE_ARGS+= --with-gxx-include-dir=${GCC_PREFIX}/include/c++/ 
117.if ${OPSYS} == "NetBSD" 81.if ${OPSYS} == "NetBSD"
118.include "../../devel/binutils/buildlink3.mk" 82.include "../../devel/binutils/buildlink3.mk"
119.include "../../devel/libelf/buildlink3.mk" 83.include "../../devel/libelf/buildlink3.mk"
120CONFIGURE_ARGS+= --with-ld=${PREFIX}/bin/gnu-ld 84CONFIGURE_ARGS+= --with-ld=${PREFIX}/bin/gnu-ld
121CONFIGURE_ARGS+= --with-libelf=${PREFIX} 85CONFIGURE_ARGS+= --with-libelf=${PREFIX}
122MAKE_ENV+= ac_cv_func_clock_gettime=yes 86MAKE_ENV+= ac_cv_func_clock_gettime=yes
123.endif 87.endif
124.if ${OPSYS} == "Linux" 88.if ${OPSYS} == "Linux"
125CONFIGURE_ARGS+= --disable-libquadmath --disable-libquadmath-support 89CONFIGURE_ARGS+= --disable-libquadmath --disable-libquadmath-support
126.endif 90.endif
127 91
128CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL} 92CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL}
129 93
130# ${WRKSRC}/gcc-4.4.1/libjava/contrib/aotcompile.py.in stores the path to 
131# a 'make' program so we need to make sure we give it the installed 'make' and not 
132# the tool wrapped one. 
133CONFIGURE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake} 
134MAKE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake} 
135 
136 
137# fastjar-0.93 from pkgsrc/archivers/fastjar seems to trigger a build 
138# failure (seen on NetBSD-5.0/i386) when building java. So in case 
139# the fastjar package is installed, make sure the configure script 
140# doesn't pick it up. 
141CONFIGURE_ENV+= JAR=no 
142MAKE_ENV+= JAR=no 
143MAKE_ENV+= ac_cv_prog_JAR=no 
144 
145MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv} 94MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
146MAKE_ENV+= SHELL=${CONFIG_SHELL} 95MAKE_ENV+= SHELL=${CONFIG_SHELL}
147MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD} 96MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD}
148 97
149# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into 98# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
150# a binary so we need to make sure we give it the installed sed and not 99# a binary so we need to make sure we give it the installed sed and not
151# the tool wrapped one. 100# the tool wrapped one.
152MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED} 101MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED}
153MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} 102MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
154 103
155CPPFLAGS+= -I${BUILDLINK_DIR}/include 104CPPFLAGS+= -I${BUILDLINK_DIR}/include
156CFLAGS+= -I${BUILDLINK_DIR}/include 105CFLAGS+= -I${BUILDLINK_DIR}/include
157 106
@@ -197,16 +146,15 @@ do-install: @@ -197,16 +146,15 @@ do-install:
197.if ${OPSYS} == "SunOS" && ${OS_VERSION} != "5.11" && 146.if ${OPSYS} == "SunOS" && ${OS_VERSION} != "5.11" &&
198!empty(MACHINE_ARCH:M*86*) 147!empty(MACHINE_ARCH:M*86*)
199post-install: 148post-install:
200 -${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 149 -${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32
201 -${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 150 -${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64
202.endif 151.endif
203 152
204GENERATE_PLIST+= \ 153GENERATE_PLIST+= \
205 cd ${DESTDIR}${PREFIX} && ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print \ 154 cd ${DESTDIR}${PREFIX} && ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print \
206 | ${SORT} ; 155 | ${SORT} ;
207 156
208.include "../../devel/gmp/buildlink3.mk" 157.include "../../devel/gmp/buildlink3.mk"
209.include "../../math/mpcomplex/buildlink3.mk" 158.include "../../math/mpcomplex/buildlink3.mk"
210.include "../../devel/zlib/buildlink3.mk" 
211.include "../../math/mpfr/buildlink3.mk" 159.include "../../math/mpfr/buildlink3.mk"
212.include "../../mk/bsd.pkg.mk" 160.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/lang/gcc46/Attic/options.mk (expand / switch to unified diff)

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