diff options
| author | hans <hans@pkgsrc.org> | 2012-04-13 10:38:26 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-04-13 10:38:26 +0000 |
| commit | 6da8ddf9f49aa4db5a5862dac55f58b88437b8aa (patch) | |
| tree | 13f5a3a3b283539cb5b9ed41cac862f546b55590 /lang/gcc46 | |
| parent | a4903b30b86c62075ea0bdd1ec984fa06bb34e04 (diff) | |
| download | pkgsrc-6da8ddf9f49aa4db5a5862dac55f58b88437b8aa.tar.gz | |
Move ICONVPREFIX definition to nls option.
Diffstat (limited to 'lang/gcc46')
| -rw-r--r-- | lang/gcc46/Makefile | 3 | ||||
| -rw-r--r-- | lang/gcc46/options.mk | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index f53d6c70c76..413a7b8e46e 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/03/15 06:45:26 sbd Exp $ +# $NetBSD: Makefile,v 1.17 2012/04/13 10:38:26 hans Exp $ DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc46-${GCC_VERSION} @@ -87,7 +87,6 @@ CONFIGURE_ARGS+= --disable-libquadmath --disable-libquadmath-support CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL} -MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv} MAKE_ENV+= SHELL=${CONFIG_SHELL} MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD} diff --git a/lang/gcc46/options.mk b/lang/gcc46/options.mk index fa3ddddfe18..4653a8ca0c0 100644 --- a/lang/gcc46/options.mk +++ b/lang/gcc46/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2012/04/08 05:04:46 sbd Exp $ +# $NetBSD: options.mk,v 1.7 2012/04/13 10:38:26 hans Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gcc46 PKG_SUPPORTED_OPTIONS= nls gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada @@ -21,6 +21,7 @@ PKG_OPTIONS_LEGACY_VARS+= BUILD_OBJC:gcc-objc USE_TOOLS+= msgfmt CONFIGURE_ARGS+= --enable-nls CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv} +MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv} .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .else |