diff options
| author | hans <hans@pkgsrc.org> | 2011-10-13 10:43:10 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2011-10-13 10:43:10 +0000 |
| commit | 7a1a122b5bbec9a14bff1fa45ba88109acf34290 (patch) | |
| tree | da1fb0f624cc278da05b9dbfb326b06f36377a20 /lang | |
| parent | ae23b84c7a745f669100a7f4cdaabe62d00b5407 (diff) | |
| download | pkgsrc-7a1a122b5bbec9a14bff1fa45ba88109acf34290.tar.gz | |
Fix options nls. No need for msgfmt or libiconv when it is off.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc46/Makefile | 7 | ||||
| -rw-r--r-- | lang/gcc46/buildlink3.mk | 6 | ||||
| -rw-r--r-- | lang/gcc46/options.mk | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index 6eb23566cd6..852f10fd4d2 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2011/10/13 10:39:45 hans Exp $ +# $NetBSD: Makefile,v 1.6 2011/10/13 10:43:10 hans Exp $ DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc46-${GCC_VERSION} @@ -15,7 +15,7 @@ LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= awk:run bash:run perl chmod \ - gmake:run makeinfo msgfmt bison flex gm4 \ + gmake:run makeinfo bison flex gm4 \ sed:run unzip DEPENDS+= zip-[0-9]*:../../archivers/zip @@ -105,7 +105,6 @@ LANGS+= objc CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q} CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} CONFIGURE_ARGS+= --with-system-zlib -CONFIGURE_ARGS+= --disable-nls CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --enable-__cxa_atexit CONFIGURE_ARGS+= --enable-long-long @@ -114,7 +113,6 @@ CONFIGURE_ARGS+= --enable-libssp CONFIGURE_ARGS+= --enable-threads=posix CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp} CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr} -CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv} CONFIGURE_ARGS+= --with-gxx-include-dir=${GCC_PREFIX}/include/c++/ .if ${OPSYS} == "NetBSD" .include "../../devel/binutils/buildlink3.mk" @@ -211,5 +209,4 @@ GENERATE_PLIST+= \ .include "../../math/mpcomplex/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../math/mpfr/buildlink3.mk" -.include "../../converters/libiconv/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/gcc46/buildlink3.mk b/lang/gcc46/buildlink3.mk index 6178de11535..2090008d04a 100644 --- a/lang/gcc46/buildlink3.mk +++ b/lang/gcc46/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2011/10/13 10:39:45 hans Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2011/10/13 10:43:10 hans Exp $ BUILDLINK_TREE+= gcc46 @@ -65,7 +65,11 @@ BUILDLINK_DEPMETHOD.gcc46?= build .endif .include "../../mk/pthread.buildlink3.mk" +pkgbase := gcc46 +.include "../../mk/pkg-build-options.mk" +.if !empty(PKG_BUILD_OPTIONS.gcc46:Mnls) .include "../../devel/gettext-lib/buildlink3.mk" +.endif .endif # GCC46_BUILDLINK3_MK BUILDLINK_TREE+= -gcc46 diff --git a/lang/gcc46/options.mk b/lang/gcc46/options.mk index f2c92d8381c..6ce84a391e4 100644 --- a/lang/gcc46/options.mk +++ b/lang/gcc46/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1.1.1 2011/05/15 00:09:56 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2011/10/13 10:43:10 hans Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gcc46 PKG_SUPPORTED_OPTIONS= nls @@ -13,7 +13,9 @@ PKG_SUGGESTED_OPTIONS+= nls ### Native Language Support ### .if !empty(PKG_OPTIONS:Mnls) +USE_TOOLS+= msgfmt CONFIGURE_ARGS+= --enable-nls +CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv} .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .else |