CVS commit: pkgsrc/lang/gcc5-aux

["John Marino" <marino%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   marino
Date:           Thu Nov 24 15:43:38 UTC 2016

Modified Files:
        pkgsrc/lang/gcc5-aux: options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc5-aux/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc5-aux/options.mk
diff -u pkgsrc/lang/gcc5-aux/options.mk:1.2 pkgsrc/lang/gcc5-aux/options.mk:1.3
--- pkgsrc/lang/gcc5-aux/options.mk:1.2 Mon Jun 15 17:14:27 2015
+++ pkgsrc/lang/gcc5-aux/options.mk     Thu Nov 24 15:43:38 2016
@@ -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=-st
 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