Sat Jul 8 21:03:16 2017 UTC ()
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.


(maya)
diff -r1.8 -r1.9 pkgsrc/lang/gcc6/Makefile
cvs diff -r1.8 -r1.9 pkgsrc/lang/gcc6/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc6/Makefile 2017/07/07 14:52:30 1.8
+++ pkgsrc/lang/gcc6/Makefile 2017/07/08 21:03:16 1.9
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile,v 1.8 2017/07/07 14:52:30 jperkin Exp $ 1# $NetBSD: Makefile,v 1.9 2017/07/08 21:03:16 maya Exp $
2 2
3GCC_PKGNAME= gcc6 3GCC_PKGNAME= gcc6
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC6_DIST_VERSION} 6DISTNAME= gcc-${GCC6_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC6_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC6_DIST_VERSION}
8## When bumping the PKGREVISION of this package the PKGREVISION of 8## When bumping the PKGREVISION of this package the PKGREVISION of
9## lang/gcc6-libs needs to be bump to be at least 1 more than the 9## lang/gcc6-libs needs to be bump to be at least 1 more than the
10## PKGREVISION of this package! 10## PKGREVISION of this package!
 11PKGREVISION= 1
11CATEGORIES= lang 12CATEGORIES= lang
12MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC6_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC6_DIST_VERSION}/}
13EXTRACT_SUFX= .tar.xz 14EXTRACT_SUFX= .tar.xz
14 15
15MAINTAINER= maya@NetBSD.org 16MAINTAINER= maya@NetBSD.org
16HOMEPAGE= http://gcc.gnu.org/ 17HOMEPAGE= http://gcc.gnu.org/
17COMMENT= The GNU Compiler Collection (GCC) - 6 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 6 Release Series
18LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
19 20
20DISTFILES= ${DEFAULT_DISTFILES} 21DISTFILES= ${DEFAULT_DISTFILES}
21EXTRACT_ONLY= ${DEFAULT_DISTFILES} 22EXTRACT_ONLY= ${DEFAULT_DISTFILES}
22 23
23NOT_FOR_PLATFORM= Interix-*-* 24NOT_FOR_PLATFORM= Interix-*-*
@@ -75,26 +76,32 @@ post-extract: @@ -75,26 +76,32 @@ post-extract:
75 ${MV} ${WRKSRC}/${ISL14} ${WRKSRC}/isl 76 ${MV} ${WRKSRC}/${ISL14} ${WRKSRC}/isl
76.endif 77.endif
77 78
78## For target librarys and libjava programs. 79## For target librarys and libjava programs.
79CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q} 80CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
80 81
81CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} 82CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
82CONFIGURE_ARGS+= --enable-shared 83CONFIGURE_ARGS+= --enable-shared
83CONFIGURE_ARGS+= --enable-long-long 84CONFIGURE_ARGS+= --enable-long-long
84CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} 85CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
85.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) 86.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
86# on NetBSD, use the native SSP code in libc 87# on NetBSD, use the native SSP code in libc
87CONFIGURE_ARGS+= --disable-libssp 88CONFIGURE_ARGS+= --disable-libssp
 89# Match base libstdc++ major
 90SUBST_CLASSES+= libstdc
 91SUBST_STAGE.libstdc= pre-configure
 92SUBST_FILES.libstdc= libstdc++-v3/configure
 93SUBST_MESSAGE.libstdc= Bumping libstdc++ major to 7
 94SUBST_SED.libstdc= -e 's,libtool_VERSION=6:,libtool_VERSION=7:,g'
88.else 95.else
89CONFIGURE_ARGS+= --enable-libssp 96CONFIGURE_ARGS+= --enable-libssp
90.endif 97.endif
91CONFIGURE_ARGS+= --enable-threads=posix 98CONFIGURE_ARGS+= --enable-threads=posix
92CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q} 99CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q}
93 100
94# multilib on Darwin requires fat-binaries 101# multilib on Darwin requires fat-binaries
95CONFIGURE_ARGS.Darwin+= --disable-multilib 102CONFIGURE_ARGS.Darwin+= --disable-multilib
96.if !empty(OSX_SDK_PATH) 103.if !empty(OSX_SDK_PATH)
97CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH} 104CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH}
98.endif 105.endif
99CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld 106CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld
100CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as 107CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as