CVS commit: pkgsrc

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Sep  8 14:05:38 UTC 2019

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

Log Message:
Add a new option 'always-libgcc', whether to install libgcc.
If the pkgsrc compiler is GCC, don't install libgcc.

Having an older libgcc is problematic: it may be missing symbols from
newer libgcc. This is what happened in PR pkg/54506.

Use this on gcc-aux and gcc5-aux: the libgcc_s.so they install is going
to be older in all the operating systems these packages support.
(Other GCC packages will require a more elaborate rule)

Leaving SmartOS unchanged, by request from jperkin.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gcc-aux/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/gcc5-aux/options.mk
cvs rdiff -u -r1.592 -r1.593 pkgsrc/mk/defaults/options.description

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

Modified files:

Index: pkgsrc/lang/gcc-aux/options.mk
diff -u pkgsrc/lang/gcc-aux/options.mk:1.6 pkgsrc/lang/gcc-aux/options.mk:1.7
--- pkgsrc/lang/gcc-aux/options.mk:1.6  Mon Jul 10 00:21:31 2017
+++ pkgsrc/lang/gcc-aux/options.mk      Sun Sep  8 14:05:38 2019
@@ -1,12 +1,19 @@
-# $NetBSD: options.mk,v 1.6 2017/07/10 00:21:31 maya Exp $
+# $NetBSD: options.mk,v 1.7 2019/09/08 14:05:38 maya Exp $
 
 # NLS is failing, might be linking with wrong iconv lib.
 # Disable option until further notice
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcc-aux
-PKG_SUPPORTED_OPTIONS=  fortran objc testsuite static bootstrap #nls
+PKG_SUPPORTED_OPTIONS=  fortran objc testsuite static bootstrap always-libgcc #nls
 PKG_SUGGESTED_OPTIONS=  fortran objc #nls
 
+.include "../../mk/compiler.mk"
+.if empty(PKGSRC_COMPILER:Mgcc)
+PKG_SUGGESTED_OPTIONS+=                always-libgcc
+.endif
+
+PKG_SUGGESTED_OPTIONS.SunOS+=  always-libgcc
+
 .include "../../mk/bsd.options.mk"
 
 
@@ -30,6 +37,17 @@ EXTRA_CONFARGS+= --enable-libquadmath
 .endif
 .endif
 
+#############################
+##  Don't install libgcc   ##
+#############################
+
+.if empty(PKG_OPTIONS:Malways-libgcc)
+post-install:  delete-installed-libgcc
+
+delete-installed-libgcc:
+       ${FIND} ${DESTDIR} -name 'libgcc_s.so*' -delete
+
+.endif
 
 #################################
 ##  ADD LANGUAGE: Objective-C  ##

Index: pkgsrc/lang/gcc5-aux/options.mk
diff -u pkgsrc/lang/gcc5-aux/options.mk:1.5 pkgsrc/lang/gcc5-aux/options.mk:1.6
--- pkgsrc/lang/gcc5-aux/options.mk:1.5 Sun Jul  9 23:17:39 2017
+++ pkgsrc/lang/gcc5-aux/options.mk     Sun Sep  8 14:05:38 2019
@@ -1,9 +1,16 @@
-# $NetBSD: options.mk,v 1.5 2017/07/09 23:17:39 maya Exp $
+# $NetBSD: options.mk,v 1.6 2019/09/08 14:05:38 maya Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcc5-aux
-PKG_SUPPORTED_OPTIONS=  fortran objc testsuite static bootstrap allstages
+PKG_SUPPORTED_OPTIONS=  fortran objc testsuite static bootstrap allstages always-libgcc
 PKG_SUGGESTED_OPTIONS=  #fortran objc 
 
+.include "../../mk/compiler.mk"
+.if empty(PKGSRC_COMPILER:Mgcc)
+PKG_SUGGESTED_OPTIONS+=                always-libgcc
+.endif
+
+PKG_SUGGESTED_OPTIONS.SunOS+=  always-libgcc
+
 # disable nls for now (build error involving iconv)
 # disable fortran, breaks during build on NetBSD 7.0-beta
 
@@ -31,6 +38,19 @@ EXTRA_CONFARGS+= --enable-libquadmath
 .endif
 
 
+#############################
+##  Don't install libgcc   ##
+#############################
+
+.if empty(PKG_OPTIONS:Malways-libgcc)
+post-install:  delete-installed-libgcc
+
+delete-installed-libgcc:
+       ${FIND} ${DESTDIR} -name 'libgcc_s.so*' -delete
+
+.endif
+
+
 #################################
 ##  ADD LANGUAGE: Objective-C  ##
 #################################

Index: pkgsrc/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.592 pkgsrc/mk/defaults/options.description:1.593
--- pkgsrc/mk/defaults/options.description:1.592        Sat Sep  7 04:17:42 2019
+++ pkgsrc/mk/defaults/options.description      Sun Sep  8 14:05:38 2019
@@ -7,6 +7,7 @@ ads                     Enable Windows Active Directory su
 afterstep              Enable afterstep support.
 agg                    Enable agg support.
 alsa                   Enable ALSA support.
+always-libgcc          Install libgcc unconditionally, even if it's older.
 amanda-bsdtar          Enable bsdtar support in Amanda.
 amanda-dump-snap       If dump supports -X, use it.
 amanda-fqdn            Use FQDN's in Amanda.