Thu Jun 22 21:44:50 2017 UTC ()
Restrict gcc gsed usage to NetBSD
(NetBSD/mips64 progress further with gsed)

Adding gsed as a tool creates circular dependencies if pkgsrc gcc is used
as the bootstrap compiler.

Pointed out by jperkin, sorry.


(maya)
diff -r1.33 -r1.34 pkgsrc/lang/gcc48/Makefile
diff -r1.17 -r1.18 pkgsrc/lang/gcc49/Makefile
diff -r1.18 -r1.19 pkgsrc/lang/gcc5/Makefile
diff -r1.5 -r1.6 pkgsrc/lang/gcc6/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/gcc7/Makefile
cvs diff -r1.33 -r1.34 pkgsrc/lang/gcc48/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc48/Attic/Makefile 2017/06/21 21:16:35 1.33
+++ pkgsrc/lang/gcc48/Attic/Makefile 2017/06/22 21:44:49 1.34
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.33 2017/06/21 21:16:35 maya Exp $ 1# $NetBSD: Makefile,v 1.34 2017/06/22 21:44:49 maya Exp $
2 2
3GCC_PKGNAME= gcc48 3GCC_PKGNAME= gcc48
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC48_DIST_VERSION} 6DISTNAME= gcc-${GCC48_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC48_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC48_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/gcc48-libs needs to be bump to be at least 1 more than the 9## lang/gcc48-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 11PKGREVISION= 1
12CATEGORIES= lang 12CATEGORIES= lang
13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
15 15
16MAINTAINER= maya@NetBSD.org 16MAINTAINER= maya@NetBSD.org
17HOMEPAGE= http://gcc.gnu.org/ 17HOMEPAGE= http://gcc.gnu.org/
18COMMENT= The GNU Compiler Collection (GCC) - 4.8 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 4.8 Release Series
19LICENSE= 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
20 20
21DISTFILES= ${DEFAULT_DISTFILES} 21DISTFILES= ${DEFAULT_DISTFILES}
22EXTRACT_ONLY= ${DEFAULT_DISTFILES} 22EXTRACT_ONLY= ${DEFAULT_DISTFILES}
23 23
24NOT_FOR_PLATFORM= Interix-*-* 24NOT_FOR_PLATFORM= Interix-*-*
25 25
26USE_LANGUAGES= c c++ 26USE_LANGUAGES= c c++
27USE_TOOLS+= gmake makeinfo gsed 27USE_TOOLS+= gmake makeinfo sed:run
 28USE_TOOLS.NetBSD+= gsed
28GNU_CONFIGURE= yes 29GNU_CONFIGURE= yes
29GCC_REQD+= 4.4 30GCC_REQD+= 4.4
30## Build outside ${WRKSRC} 31## Build outside ${WRKSRC}
31OBJDIR= ../build 32OBJDIR= ../build
32CONFIGURE_DIRS= ${OBJDIR} 33CONFIGURE_DIRS= ${OBJDIR}
33CONFIGURE_SCRIPT= ../${DISTNAME}/configure 34CONFIGURE_SCRIPT= ../${DISTNAME}/configure
34GCC_SUBPREFIX= ${GCC_PKGNAME} 35GCC_SUBPREFIX= ${GCC_PKGNAME}
35GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} 36GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
36GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM} 37GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
37GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} 38GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
38INFO_FILES= yes 39INFO_FILES= yes
39 40
40UNLIMIT_RESOURCES+= datasize 41UNLIMIT_RESOURCES+= datasize
cvs diff -r1.17 -r1.18 pkgsrc/lang/gcc49/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc49/Attic/Makefile 2017/06/21 21:16:35 1.17
+++ pkgsrc/lang/gcc49/Attic/Makefile 2017/06/22 21:44:49 1.18
@@ -1,41 +1,43 @@ @@ -1,41 +1,43 @@
1# $NetBSD: Makefile,v 1.17 2017/06/21 21:16:35 maya Exp $ 1# $NetBSD: Makefile,v 1.18 2017/06/22 21:44:49 maya Exp $
2 2
3GCC_PKGNAME= gcc49 3GCC_PKGNAME= gcc49
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC49_DIST_VERSION} 6DISTNAME= gcc-${GCC49_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC49_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC49_DIST_VERSION}
8 8
9## When bumping the PKGREVISION of this package the PKGREVISION of 9## When bumping the PKGREVISION of this package the PKGREVISION of
10## lang/gcc49-libs needs to be bump to be at least 1 more than the 10## lang/gcc49-libs needs to be bump to be at least 1 more than the
11## PKGREVISION of this package! 11## PKGREVISION of this package!
12PKGREVISION= 1 12PKGREVISION= 1
13CATEGORIES= lang 13CATEGORIES= lang
14MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC49_DIST_VERSION}/} 14MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC49_DIST_VERSION}/}
15EXTRACT_SUFX= .tar.bz2 15EXTRACT_SUFX= .tar.bz2
16 16
17MAINTAINER= maya@NetBSD.org 17MAINTAINER= maya@NetBSD.org
18HOMEPAGE= http://gcc.gnu.org/ 18HOMEPAGE= http://gcc.gnu.org/
19COMMENT= The GNU Compiler Collection (GCC) - 4.9 Release Series 19COMMENT= The GNU Compiler Collection (GCC) - 4.9 Release Series
20LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 20LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
21 21
22DISTFILES= ${DEFAULT_DISTFILES} 22DISTFILES= ${DEFAULT_DISTFILES}
23EXTRACT_ONLY= ${DEFAULT_DISTFILES} 23EXTRACT_ONLY= ${DEFAULT_DISTFILES}
24 24
25NOT_FOR_PLATFORM= Interix-*-* 25NOT_FOR_PLATFORM= Interix-*-*
26 26
27USE_LANGUAGES= c c++ 27USE_LANGUAGES= c c++
28USE_TOOLS+= gmake makeinfo gsed 28USE_TOOLS+= gmake makeinfo sed:run
 29USE_TOOLS.NetBSD+= gsed
 30
29 31
30GNU_CONFIGURE= yes 32GNU_CONFIGURE= yes
31## Build outside ${WRKSRC} 33## Build outside ${WRKSRC}
32OBJDIR= ../build 34OBJDIR= ../build
33CONFIGURE_DIRS= ${OBJDIR} 35CONFIGURE_DIRS= ${OBJDIR}
34CONFIGURE_SCRIPT= ../${DISTNAME}/configure 36CONFIGURE_SCRIPT= ../${DISTNAME}/configure
35GCC_SUBPREFIX= ${GCC_PKGNAME} 37GCC_SUBPREFIX= ${GCC_PKGNAME}
36GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} 38GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
37GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM} 39GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
38GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} 40GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
39INFO_FILES= yes 41INFO_FILES= yes
40CONFIGURE_ARGS+= --disable-libstdcxx-pch 42CONFIGURE_ARGS+= --disable-libstdcxx-pch
41 43
cvs diff -r1.18 -r1.19 pkgsrc/lang/gcc5/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc5/Attic/Makefile 2017/06/21 21:16:36 1.18
+++ pkgsrc/lang/gcc5/Attic/Makefile 2017/06/22 21:44:49 1.19
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.18 2017/06/21 21:16:36 maya Exp $ 1# $NetBSD: Makefile,v 1.19 2017/06/22 21:44:49 maya Exp $
2 2
3GCC_PKGNAME= gcc5 3GCC_PKGNAME= gcc5
4PKGREVISION= 3 4PKGREVISION= 3
5.include "version.mk" 5.include "version.mk"
6 6
7DISTNAME= gcc-${GCC5_DIST_VERSION} 7DISTNAME= gcc-${GCC5_DIST_VERSION}
8PKGNAME= ${GCC_PKGNAME}-${GCC5_DIST_VERSION} 8PKGNAME= ${GCC_PKGNAME}-${GCC5_DIST_VERSION}
9## When bumping the PKGREVISION of this package the PKGREVISION of 9## When bumping the PKGREVISION of this package the PKGREVISION of
10## lang/gcc5-libs needs to be bump to be at least 1 more than the 10## lang/gcc5-libs needs to be bump to be at least 1 more than the
11## PKGREVISION of this package! 11## PKGREVISION of this package!
12CATEGORIES= lang 12CATEGORIES= lang
13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC5_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC5_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
15 15
16MAINTAINER= maya@NetBSD.org 16MAINTAINER= maya@NetBSD.org
17HOMEPAGE= http://gcc.gnu.org/ 17HOMEPAGE= http://gcc.gnu.org/
18COMMENT= The GNU Compiler Collection (GCC) - 5 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 5 Release Series
19LICENSE= 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
20 20
21DISTFILES= ${DEFAULT_DISTFILES} 21DISTFILES= ${DEFAULT_DISTFILES}
22EXTRACT_ONLY= ${DEFAULT_DISTFILES} 22EXTRACT_ONLY= ${DEFAULT_DISTFILES}
23 23
24NOT_FOR_PLATFORM= Interix-*-* 24NOT_FOR_PLATFORM= Interix-*-*
25 25
26USE_LANGUAGES= c c++ 26USE_LANGUAGES= c c++
27USE_TOOLS+= gmake makeinfo gsed tar:build 27USE_TOOLS+= gmake makeinfo sed:run tar:build
 28USE_TOOLS.NetBSD+= gsed
28 29
29GNU_CONFIGURE= yes 30GNU_CONFIGURE= yes
30## Build outside ${WRKSRC} 31## Build outside ${WRKSRC}
31OBJDIR= ../build 32OBJDIR= ../build
32CONFIGURE_DIRS= ${OBJDIR} 33CONFIGURE_DIRS= ${OBJDIR}
33CONFIGURE_SCRIPT= ../${DISTNAME}/configure 34CONFIGURE_SCRIPT= ../${DISTNAME}/configure
34GCC_SUBPREFIX= ${GCC_PKGNAME} 35GCC_SUBPREFIX= ${GCC_PKGNAME}
35GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} 36GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
36GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} 37GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
37INFO_FILES= yes 38INFO_FILES= yes
38CONFIGURE_ARGS+= --disable-libstdcxx-pch 39CONFIGURE_ARGS+= --disable-libstdcxx-pch
39 40
40UNLIMIT_RESOURCES+= datasize 41UNLIMIT_RESOURCES+= datasize
cvs diff -r1.5 -r1.6 pkgsrc/lang/gcc6/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc6/Makefile 2017/06/21 21:16:36 1.5
+++ pkgsrc/lang/gcc6/Makefile 2017/06/22 21:44:49 1.6
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.5 2017/06/21 21:16:36 maya Exp $ 1# $NetBSD: Makefile,v 1.6 2017/06/22 21:44:49 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 11PKGREVISION= 1
12CATEGORIES= lang 12CATEGORIES= lang
13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC6_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC6_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
15 15
16MAINTAINER= maya@NetBSD.org 16MAINTAINER= maya@NetBSD.org
17HOMEPAGE= http://gcc.gnu.org/ 17HOMEPAGE= http://gcc.gnu.org/
18COMMENT= The GNU Compiler Collection (GCC) - 6 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 6 Release Series
19LICENSE= 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
20 20
21DISTFILES= ${DEFAULT_DISTFILES} 21DISTFILES= ${DEFAULT_DISTFILES}
22EXTRACT_ONLY= ${DEFAULT_DISTFILES} 22EXTRACT_ONLY= ${DEFAULT_DISTFILES}
23 23
24NOT_FOR_PLATFORM= Interix-*-* 24NOT_FOR_PLATFORM= Interix-*-*
25 25
26USE_LANGUAGES= c c++ 26USE_LANGUAGES= c c++
27USE_TOOLS+= gmake makeinfo gsed tar:build 27USE_TOOLS+= gmake makeinfo sed:run tar:build
 28USE_TOOLS.NetBSD+= gsed
28 29
29GNU_CONFIGURE= yes 30GNU_CONFIGURE= yes
30## Build outside ${WRKSRC} 31## Build outside ${WRKSRC}
31OBJDIR= ../build 32OBJDIR= ../build
32CONFIGURE_DIRS= ${OBJDIR} 33CONFIGURE_DIRS= ${OBJDIR}
33CONFIGURE_SCRIPT= ../${DISTNAME}/configure 34CONFIGURE_SCRIPT= ../${DISTNAME}/configure
34GCC_SUBPREFIX= ${GCC_PKGNAME} 35GCC_SUBPREFIX= ${GCC_PKGNAME}
35GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} 36GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
36GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} 37GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
37INFO_FILES= yes 38INFO_FILES= yes
38CONFIGURE_ARGS+= --disable-libstdcxx-pch 39CONFIGURE_ARGS+= --disable-libstdcxx-pch
39 40
40UNLIMIT_RESOURCES+= datasize 41UNLIMIT_RESOURCES+= datasize
cvs diff -r1.6 -r1.7 pkgsrc/lang/gcc7/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc7/Makefile 2017/06/21 21:16:36 1.6
+++ pkgsrc/lang/gcc7/Makefile 2017/06/22 21:44:49 1.7
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.6 2017/06/21 21:16:36 maya Exp $ 1# $NetBSD: Makefile,v 1.7 2017/06/22 21:44:49 maya Exp $
2 2
3GCC_PKGNAME= gcc7 3GCC_PKGNAME= gcc7
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC7S_DIST_VERSION} 6DISTNAME= gcc-${GCC7S_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC7S_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC7S_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/gcc7-libs needs to be bump to be at least 1 more than the 9## lang/gcc7-libs needs to be bump to be at least 1 more than the
10## PKGREVISION of this package! 10## PKGREVISION of this package!
11PKGREVISION= 3 11PKGREVISION= 3
12CATEGORIES= lang 12CATEGORIES= lang
13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7S_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7S_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
15 15
16MAINTAINER= maya@NetBSD.org 16MAINTAINER= maya@NetBSD.org
17HOMEPAGE= http://gcc.gnu.org/ 17HOMEPAGE= http://gcc.gnu.org/
18COMMENT= The GNU Compiler Collection (GCC) - 7.0 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 7.0 Release Series
19LICENSE= 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
20 20
21DISTFILES= ${DEFAULT_DISTFILES} 21DISTFILES= ${DEFAULT_DISTFILES}
22EXTRACT_ONLY= ${DEFAULT_DISTFILES} 22EXTRACT_ONLY= ${DEFAULT_DISTFILES}
23 23
24NOT_FOR_PLATFORM= Interix-*-* 24NOT_FOR_PLATFORM= Interix-*-*
25 25
26USE_LANGUAGES= c c++ 26USE_LANGUAGES= c c++
27USE_TOOLS+= gmake makeinfo gsed tar:build 27USE_TOOLS+= gmake makeinfo sed:run tar:build
 28USE_TOOLS.NetBSD+= gsed
28 29
29GNU_CONFIGURE= yes 30GNU_CONFIGURE= yes
30## Build outside ${WRKSRC} 31## Build outside ${WRKSRC}
31OBJDIR= ../build 32OBJDIR= ../build
32CONFIGURE_DIRS= ${OBJDIR} 33CONFIGURE_DIRS= ${OBJDIR}
33CONFIGURE_SCRIPT= ../${DISTNAME}/configure 34CONFIGURE_SCRIPT= ../${DISTNAME}/configure
34GCC_SUBPREFIX= ${GCC_PKGNAME} 35GCC_SUBPREFIX= ${GCC_PKGNAME}
35GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} 36GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
36GNU_CONFIGURE_PREFIX= ${GCC_PREFIX} 37GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
37INFO_FILES= yes 38INFO_FILES= yes
38CONFIGURE_ARGS+= --disable-libstdcxx-pch 39CONFIGURE_ARGS+= --disable-libstdcxx-pch
39 40
40UNLIMIT_RESOURCES+= datasize 41UNLIMIT_RESOURCES+= datasize