[pkgsrc/trunk]: pkgsrc/lang/gcc5-aux lang/gcc5-aux: add "allstages" option an...

[marino <marino%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4af931cffc72
branches:  trunk
changeset: 355182:4af931cffc72
user:      marino <marino%pkgsrc.org@localhost>
date:      Thu Nov 24 15:43:38 2016 +0000

description:
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:

 lang/gcc5-aux/options.mk |  20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

diffs (43 lines):

diff -r 20d78985087f -r 4af931cffc72 lang/gcc5-aux/options.mk
--- a/lang/gcc5-aux/options.mk  Thu Nov 24 14:11:31 2016 +0000
+++ b/lang/gcc5-aux/options.mk  Thu Nov 24 15:43:38 2016 +0000
@@ -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 @@
 ##  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-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