Fri Apr 13 10:35:38 2012 UTC ()
Move ICONVPREFIX definiton to nls option.


(hans)
diff -r1.33 -r1.34 pkgsrc/lang/gcc44/Makefile
diff -r1.9 -r1.10 pkgsrc/lang/gcc44/options.mk
cvs diff -r1.33 -r1.34 pkgsrc/lang/gcc44/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc44/Attic/Makefile 2012/03/15 07:43:30 1.33
+++ pkgsrc/lang/gcc44/Attic/Makefile 2012/04/13 10:35:38 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.33 2012/03/15 07:43:30 sbd Exp $ 1# $NetBSD: Makefile,v 1.34 2012/04/13 10:35:38 hans Exp $
2 2
3DISTNAME= gcc-${GCC_VERSION} 3DISTNAME= gcc-${GCC_VERSION}
4PKGNAME= gcc44-${GCC_VERSION} 4PKGNAME= gcc44-${GCC_VERSION}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/} 6MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= sbd@NetBSD.org 9MAINTAINER= sbd@NetBSD.org
10HOMEPAGE= http://gcc.gnu.org/ 10HOMEPAGE= http://gcc.gnu.org/
11COMMENT= GNU Compiler Collection 4.4 11COMMENT= GNU Compiler Collection 4.4
12LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 12LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -65,27 +65,26 @@ REPLACE_BASH+= libstdc++-v3/scripts/run_ @@ -65,27 +65,26 @@ REPLACE_BASH+= libstdc++-v3/scripts/run_
65 65
66CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q} 66CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q}
67CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} 67CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
68CONFIGURE_ARGS+= --enable-shared 68CONFIGURE_ARGS+= --enable-shared
69CONFIGURE_ARGS+= --enable-long-long 69CONFIGURE_ARGS+= --enable-long-long
70CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} 70CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
71CONFIGURE_ARGS+= --disable-libssp 71CONFIGURE_ARGS+= --disable-libssp
72CONFIGURE_ARGS+= --enable-threads=posix 72CONFIGURE_ARGS+= --enable-threads=posix
73CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp} 73CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}
74CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr} 74CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr}
75 75
76CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL} 76CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL}
77 77
78MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv} 
79MAKE_ENV+= SHELL=${CONFIG_SHELL} 78MAKE_ENV+= SHELL=${CONFIG_SHELL}
80MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD} 79MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD}
81 80
82# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into 81# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
83# a binary so we need to make sure we give it the installed sed and not 82# a binary so we need to make sure we give it the installed sed and not
84# the tool wrapped one. 83# the tool wrapped one.
85MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED} 84MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
86 85
87CPPFLAGS+= -I${BUILDLINK_DIR}/include 86CPPFLAGS+= -I${BUILDLINK_DIR}/include
88CFLAGS+= -I${BUILDLINK_DIR}/include 87CFLAGS+= -I${BUILDLINK_DIR}/include
89 88
90# Somone should fix this so it will match the NetBSD system compiler 89# Somone should fix this so it will match the NetBSD system compiler
91#.if ${OPSYS} == "NetBSD" 90#.if ${OPSYS} == "NetBSD"
cvs diff -r1.9 -r1.10 pkgsrc/lang/gcc44/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/gcc44/Attic/options.mk 2012/04/08 05:04:36 1.9
+++ pkgsrc/lang/gcc44/Attic/options.mk 2012/04/13 10:35:38 1.10
@@ -1,35 +1,36 @@ @@ -1,35 +1,36 @@
1# $NetBSD: options.mk,v 1.9 2012/04/08 05:04:36 sbd Exp $ 1# $NetBSD: options.mk,v 1.10 2012/04/13 10:35:38 hans Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gcc44 3PKG_OPTIONS_VAR= PKG_OPTIONS.gcc44
4PKG_SUPPORTED_OPTIONS= nls gcc-c++ 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-c++ gcc-fortran gcc-java gcc-objc 5PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-java 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++ 10PKG_OPTIONS_LEGACY_VARS+= BUILD_CXX:gcc-c++
11PKG_OPTIONS_LEGACY_VARS+= BUILD_FORTRAN:gcc-fortran 11PKG_OPTIONS_LEGACY_VARS+= BUILD_FORTRAN:gcc-fortran
12PKG_OPTIONS_LEGACY_VARS+= BUILD_JAVA:gcc-java 12PKG_OPTIONS_LEGACY_VARS+= BUILD_JAVA:gcc-java
13PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:gcc-objc 13PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:gcc-objc
14 14
15.include "../../mk/bsd.options.mk" 15.include "../../mk/bsd.options.mk"
16 16
17### 17###
18### Native Language Support 18### Native Language Support
19### 19###
20.if !empty(PKG_OPTIONS:Mnls) 20.if !empty(PKG_OPTIONS:Mnls)
21CONFIGURE_ARGS+= --enable-nls 21CONFIGURE_ARGS+= --enable-nls
22USE_TOOLS+= msgfmt 22USE_TOOLS+= msgfmt
 23MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
23.include "../../converters/libiconv/buildlink3.mk" 24.include "../../converters/libiconv/buildlink3.mk"
24.include "../../devel/gettext-lib/buildlink3.mk" 25.include "../../devel/gettext-lib/buildlink3.mk"
25.else 26.else
26CONFIGURE_ARGS+= --disable-nls 27CONFIGURE_ARGS+= --disable-nls
27.endif 28.endif
28 29
29### 30###
30### Optional languages 31### Optional languages
31### Ada could be added although there is a bootstrapping issue. See 32### Ada could be added although there is a bootstrapping issue. See
32### ../gcc34-ada for guidance 33### ../gcc34-ada for guidance
33### 34###
34 35
35LANGS= c 36LANGS= c