diff options
| author | marino <marino@pkgsrc.org> | 2016-11-24 15:43:38 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2016-11-24 15:43:38 +0000 |
| commit | ca624b7b0b4bde8a3cd22ee84526ad1b5938a3b6 (patch) | |
| tree | 98244451014046f5da2d08f2235481d1e7190419 /lang | |
| parent | d36444a3d2aa8e4077b4983e037adbe15b482349 (diff) | |
| download | pkgsrc-ca624b7b0b4bde8a3cd22ee84526ad1b5938a3b6.tar.gz | |
lang/gcc5-aux: add "allstages" option and explicitly enable shared
The compiler failed to build on DragonFly and I think it was because
--enable-shared wasn't explicitly set. Previously this was the default
but maybe it's not anymore. While here I added a new (non-default)
option to build via a long 3 stages instead of a quick single stage.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc5-aux/options.mk | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/lang/gcc5-aux/options.mk b/lang/gcc5-aux/options.mk index e91d5a82e79..d1d78fce58b 100644 --- a/lang/gcc5-aux/options.mk +++ b/lang/gcc5-aux/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2015/06/15 17:14:27 marino Exp $ +# $NetBSD: options.mk,v 1.3 2016/11/24 15:43:38 marino Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gcc5-aux -PKG_SUPPORTED_OPTIONS= fortran objc testsuite static bootstrap +PKG_SUPPORTED_OPTIONS= fortran objc testsuite static bootstrap allstages PKG_SUGGESTED_OPTIONS= #fortran objc # disable nls for now (build error involving iconv) @@ -56,17 +56,7 @@ APPLY_DIFFS+= gcc-testsuite ## NATIONAL LANGUAGE SUPPORT ## ################################# -.if !empty(PKG_OPTIONS:Mnls) && empty(PKG_OPTIONS:Mbootstrap) -USE_BUILTIN.iconv= no -USE_TOOLS+= msgfmt -EXTRA_CONFARGS+= --enable-nls -EXTRA_CONFARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} -MY_MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv} -.include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/gettext-lib/buildlink3.mk" -.else EXTRA_CONFARGS+= --disable-nls -.endif ############################### @@ -120,7 +110,9 @@ EXTRA_CONFARGS+= --with-boot-ldflags=-static EXTRA_CONFARGS+= --with-system-zlib . endif .else -EXTRA_CONFARGS+= --enable-shared +. if !empty(PKG_OPTIONS:Mallstages) EXTRA_CONFARGS+= --disable-bootstrap - +EXTRA_CONFARGS+= --disable-libcc1 +. endif +EXTRA_CONFARGS+= --enable-shared .endif |