CVS commit: pkgsrc/lang/gcc6

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat Jul  8 21:03:16 UTC 2017

Modified Files:
        pkgsrc/lang/gcc6: Makefile

Log Message:
gcc6: on netbsd only, bump libstdc++ major to 7 to match base version.

this stops packages using gcc6 as a compiler from linking to two libstdc++s
at once.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/gcc6/Makefile

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

Modified files:

Index: pkgsrc/lang/gcc6/Makefile
diff -u pkgsrc/lang/gcc6/Makefile:1.8 pkgsrc/lang/gcc6/Makefile:1.9
--- pkgsrc/lang/gcc6/Makefile:1.8       Fri Jul  7 14:52:30 2017
+++ pkgsrc/lang/gcc6/Makefile   Sat Jul  8 21:03:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/07/07 14:52:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2017/07/08 21:03:16 maya Exp $
 
 GCC_PKGNAME=           gcc6
 .include               "version.mk"
@@ -8,6 +8,7 @@ PKGNAME=        ${GCC_PKGNAME}-${GCC6_DIST_VERS
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc6-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC6_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.xz
@@ -85,6 +86,12 @@ CONFIGURE_ARGS+=     --with-local-prefix=${G
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
 # on NetBSD, use the native SSP code in libc
 CONFIGURE_ARGS+=       --disable-libssp
+# Match base libstdc++ major
+SUBST_CLASSES+=                libstdc
+SUBST_STAGE.libstdc=   pre-configure
+SUBST_FILES.libstdc=   libstdc++-v3/configure
+SUBST_MESSAGE.libstdc= Bumping libstdc++ major to 7
+SUBST_SED.libstdc=     -e 's,libtool_VERSION=6:,libtool_VERSION=7:,g'
 .else
 CONFIGURE_ARGS+=       --enable-libssp
 .endif