Thu Mar 10 16:43:11 2022 UTC ()
gcc8: deconditionalize CHECK_RELRO_SKIP

as hinted by mef's recent bulk build, it appears to be more complicated
than simply a matter of bootstrapping


(nia)
diff -r1.14 -r1.15 pkgsrc/lang/gcc10/Makefile
diff -r1.34 -r1.35 pkgsrc/lang/gcc6/Makefile
diff -r1.42 -r1.43 pkgsrc/lang/gcc7/Makefile
diff -r1.30 -r1.31 pkgsrc/lang/gcc8/Makefile
diff -r1.34 -r1.35 pkgsrc/lang/gcc9/Makefile
cvs diff -r1.14 -r1.15 pkgsrc/lang/gcc10/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc10/Makefile 2021/10/12 13:46:14 1.14
+++ pkgsrc/lang/gcc10/Makefile 2022/03/10 16:43:11 1.15
@@ -1,38 +1,39 @@ @@ -1,38 +1,39 @@
1# $NetBSD: Makefile,v 1.14 2021/10/12 13:46:14 tnn Exp $ 1# $NetBSD: Makefile,v 1.15 2022/03/10 16:43:11 nia Exp $
2 2
3GCC_PKGNAME= gcc10 3GCC_PKGNAME= gcc10
4PKGREVISION= 1 4PKGREVISION= 1
5.include "version.mk" 5.include "version.mk"
6 6
7DISTNAME= gcc-${GCC10_DIST_VERSION} 7DISTNAME= gcc-${GCC10_DIST_VERSION}
8PKGNAME= ${GCC_PKGNAME}-${GCC10_DIST_VERSION} 8PKGNAME= ${GCC_PKGNAME}-${GCC10_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/gcc10-libs needs to be bumped to be at least 1 more than the 10## lang/gcc10-libs needs to be bumped 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-${GCC10_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC10_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.xz 14EXTRACT_SUFX= .tar.xz
15 15
16MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
17HOMEPAGE= https://gcc.gnu.org/ 17HOMEPAGE= https://gcc.gnu.org/
18COMMENT= The GNU Compiler Collection (GCC) - 10.0 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 10.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
24# Relocations result in a linker error on AArch64, but not x86. 24# Relocations result in a linker error on AArch64, but not x86.
25MKPIE_SUPPORTED= no 25MKPIE_SUPPORTED= no
 26CHECK_RELRO_SKIP+= ${GCC_PKGNAME}/lib/*
26 27
27NOT_FOR_PLATFORM= Interix-*-* 28NOT_FOR_PLATFORM= Interix-*-*
28 29
29USE_LANGUAGES= c99 c++ 30USE_LANGUAGES= c99 c++
30USE_TOOLS+= gmake makeinfo sed:run tar:build 31USE_TOOLS+= gmake makeinfo sed:run tar:build
31USE_TOOLS.NetBSD+= gsed 32USE_TOOLS.NetBSD+= gsed
32 33
33GNU_CONFIGURE= yes 34GNU_CONFIGURE= yes
34GNU_CONFIGURE_STRICT= no 35GNU_CONFIGURE_STRICT= no
35## Build outside ${WRKSRC} 36## Build outside ${WRKSRC}
36OBJDIR= ../build 37OBJDIR= ../build
37CONFIGURE_DIRS= ${OBJDIR} 38CONFIGURE_DIRS= ${OBJDIR}
38CONFIGURE_SCRIPT= ../${DISTNAME}/configure 39CONFIGURE_SCRIPT= ../${DISTNAME}/configure
@@ -115,27 +116,26 @@ CONFIGURE_ARGS.Darwin+= --disable-multil @@ -115,27 +116,26 @@ CONFIGURE_ARGS.Darwin+= --disable-multil
115CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH} 116CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH}
116.endif 117.endif
117CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld 118CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld
118CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as 119CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as
119MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes 120MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes
120MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no 121MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no
121MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no 122MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no
122MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no 123MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no
123MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no 124MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no
124MAKE_ENV.SunOS+= ac_cv_func_mkostemp=no 125MAKE_ENV.SunOS+= ac_cv_func_mkostemp=no
125 126
126.if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly" 127.if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly"
127CONFIGURE_ARGS+= --disable-bootstrap 128CONFIGURE_ARGS+= --disable-bootstrap
128CHECK_RELRO_SKIP+= ${GCC_PKGNAME}/lib/* 
129.endif 129.endif
130 130
131.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386) 131.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
132CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486 132CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
133.endif 133.endif
134 134
135.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 135.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
136CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse 136CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse
137.endif 137.endif
138 138
139.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 139.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
140CONFIGURE_ARGS+= --with-dwarf2 140CONFIGURE_ARGS+= --with-dwarf2
141.endif 141.endif
cvs diff -r1.34 -r1.35 pkgsrc/lang/gcc6/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc6/Makefile 2021/10/12 13:46:14 1.34
+++ pkgsrc/lang/gcc6/Makefile 2022/03/10 16:43:11 1.35
@@ -1,38 +1,39 @@ @@ -1,38 +1,39 @@
1# $NetBSD: Makefile,v 1.34 2021/10/12 13:46:14 tnn Exp $ 1# $NetBSD: Makefile,v 1.35 2022/03/10 16:43:11 nia 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 bumped to be at least 1 more than the 9## lang/gcc6-libs needs to be bumped to be at least 1 more than the
10## PKGREVISION of this package! 10## PKGREVISION of this package!
11PKGREVISION= 7 11PKGREVISION= 7
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.xz 14EXTRACT_SUFX= .tar.xz
15 15
16MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
17HOMEPAGE= https://gcc.gnu.org/ 17HOMEPAGE= https://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
24# Relocations result in a linker error on AArch64, but not x86. 24# Relocations result in a linker error on AArch64, but not x86.
25MKPIE_SUPPORTED= no 25MKPIE_SUPPORTED= no
 26CHECK_RELRO_SKIP+= ${GCC_PKGNAME}/lib/*
26 27
27NOT_FOR_PLATFORM= Interix-*-* 28NOT_FOR_PLATFORM= Interix-*-*
28 29
29USE_LANGUAGES= c c++ 30USE_LANGUAGES= c c++
30USE_TOOLS+= gmake makeinfo sed:run tar:build 31USE_TOOLS+= gmake makeinfo sed:run tar:build
31USE_TOOLS.NetBSD+= gsed 32USE_TOOLS.NetBSD+= gsed
32 33
33GNU_CONFIGURE= yes 34GNU_CONFIGURE= yes
34GNU_CONFIGURE_STRICT= no # has sub-configures 35GNU_CONFIGURE_STRICT= no # has sub-configures
35## Build outside ${WRKSRC} 36## Build outside ${WRKSRC}
36OBJDIR= ../build 37OBJDIR= ../build
37CONFIGURE_DIRS= ${OBJDIR} 38CONFIGURE_DIRS= ${OBJDIR}
38CONFIGURE_SCRIPT= ../${DISTNAME}/configure 39CONFIGURE_SCRIPT= ../${DISTNAME}/configure
@@ -124,27 +125,26 @@ CONFIGURE_ARGS.Darwin+= --disable-multil @@ -124,27 +125,26 @@ CONFIGURE_ARGS.Darwin+= --disable-multil
124CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH} 125CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH}
125.endif 126.endif
126CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld 127CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld
127CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as 128CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as
128MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes 129MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes
129MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no 130MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no
130MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no 131MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no
131MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no 132MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no
132MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no 133MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no
133MAKE_ENV.SunOS+= ac_cv_func_mkostemp=no 134MAKE_ENV.SunOS+= ac_cv_func_mkostemp=no
134 135
135.if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly" 136.if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly"
136CONFIGURE_ARGS+= --disable-bootstrap 137CONFIGURE_ARGS+= --disable-bootstrap
137CHECK_RELRO_SKIP+= ${GCC_PKGNAME}/lib/* 
138.endif 138.endif
139 139
140.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386) 140.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
141CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486 141CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
142.endif 142.endif
143 143
144.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 144.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
145CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse 145CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse
146.endif 146.endif
147 147
148.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 148.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
149CONFIGURE_ARGS+= --with-dwarf2 149CONFIGURE_ARGS+= --with-dwarf2
150.endif 150.endif
cvs diff -r1.42 -r1.43 pkgsrc/lang/gcc7/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc7/Makefile 2021/10/12 13:46:14 1.42
+++ pkgsrc/lang/gcc7/Makefile 2022/03/10 16:43:11 1.43
@@ -1,38 +1,39 @@ @@ -1,38 +1,39 @@
1# $NetBSD: Makefile,v 1.42 2021/10/12 13:46:14 tnn Exp $ 1# $NetBSD: Makefile,v 1.43 2022/03/10 16:43:11 nia Exp $
2 2
3GCC_PKGNAME= gcc7 3GCC_PKGNAME= gcc7
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC7_DIST_VERSION} 6DISTNAME= gcc-${GCC7_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC7_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC7_DIST_VERSION}
8PKGREVISION= 5 8PKGREVISION= 5
9## When bumping the PKGREVISION of this package the PKGREVISION of 9## When bumping the PKGREVISION of this package the PKGREVISION of
10## lang/gcc7-libs needs to be bumped to be at least 1 more than the 10## lang/gcc7-libs needs to be bumped 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-${GCC7_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.xz 14EXTRACT_SUFX= .tar.xz
15EXTRACT_USING= bsdtar 15EXTRACT_USING= bsdtar
16 16
17MAINTAINER= pkgsrc-users@NetBSD.org 17MAINTAINER= pkgsrc-users@NetBSD.org
18HOMEPAGE= https://gcc.gnu.org/ 18HOMEPAGE= https://gcc.gnu.org/
19COMMENT= The GNU Compiler Collection (GCC) - 7.0 Release Series 19COMMENT= The GNU Compiler Collection (GCC) - 7.0 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}
23 23
24# Relocations result in a linker error on AArch64, but not x86. 24# Relocations result in a linker error on AArch64, but not x86.
25MKPIE_SUPPORTED= no 25MKPIE_SUPPORTED= no
 26CHECK_RELRO_SKIP+= ${GCC_PKGNAME}/lib/*
26 27
27NOT_FOR_PLATFORM= Interix-*-* Darwin-*-aarch64 28NOT_FOR_PLATFORM= Interix-*-* Darwin-*-aarch64
28 29
29USE_LANGUAGES= c99 c++ 30USE_LANGUAGES= c99 c++
30USE_TOOLS+= gmake makeinfo perl sed:run tar:build 31USE_TOOLS+= gmake makeinfo perl sed:run tar:build
31USE_TOOLS.NetBSD+= gsed 32USE_TOOLS.NetBSD+= gsed
32 33
33GNU_CONFIGURE= yes 34GNU_CONFIGURE= yes
34GNU_CONFIGURE_STRICT= no # has sub-configures 35GNU_CONFIGURE_STRICT= no # has sub-configures
35## Build outside ${WRKSRC} 36## Build outside ${WRKSRC}
36OBJDIR= ../build 37OBJDIR= ../build
37CONFIGURE_DIRS= ${OBJDIR} 38CONFIGURE_DIRS= ${OBJDIR}
38CONFIGURE_SCRIPT= ../${DISTNAME}/configure 39CONFIGURE_SCRIPT= ../${DISTNAME}/configure
@@ -114,27 +115,26 @@ CONFIGURE_ARGS.Darwin+= --disable-multil @@ -114,27 +115,26 @@ CONFIGURE_ARGS.Darwin+= --disable-multil
114CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH} 115CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH}
115.endif 116.endif
116CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld 117CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld
117CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as 118CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as
118MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes 119MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes
119MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no 120MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no
120MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no 121MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no
121MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no 122MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no
122MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no 123MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no
123MAKE_ENV.SunOS+= ac_cv_func_mkostemp=no 124MAKE_ENV.SunOS+= ac_cv_func_mkostemp=no
124 125
125.if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly" 126.if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly"
126CONFIGURE_ARGS+= --disable-bootstrap 127CONFIGURE_ARGS+= --disable-bootstrap
127CHECK_RELRO_SKIP+= ${GCC_PKGNAME}/lib/* 
128.endif 128.endif
129 129
130.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386) 130.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
131CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486 131CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
132.endif 132.endif
133 133
134.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 134.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
135CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse 135CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse
136.endif 136.endif
137 137
138.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 138.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
139CONFIGURE_ARGS+= --with-dwarf2 139CONFIGURE_ARGS+= --with-dwarf2
140.endif 140.endif
cvs diff -r1.30 -r1.31 pkgsrc/lang/gcc8/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc8/Makefile 2021/10/12 13:46:15 1.30
+++ pkgsrc/lang/gcc8/Makefile 2022/03/10 16:43:11 1.31
@@ -1,38 +1,39 @@ @@ -1,38 +1,39 @@
1# $NetBSD: Makefile,v 1.30 2021/10/12 13:46:15 tnn Exp $ 1# $NetBSD: Makefile,v 1.31 2022/03/10 16:43:11 nia Exp $
2 2
3GCC_PKGNAME= gcc8 3GCC_PKGNAME= gcc8
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC8_DIST_VERSION} 6DISTNAME= gcc-${GCC8_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC8_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC8_DIST_VERSION}
8PKGREVISION= 5 8PKGREVISION= 5
9## When bumping the PKGREVISION of this package the PKGREVISION of 9## When bumping the PKGREVISION of this package the PKGREVISION of
10## lang/gcc8-libs needs to be bumped to be at least 1 more than the 10## lang/gcc8-libs needs to be bumped 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-${GCC8_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC8_DIST_VERSION}/}
14EXTRACT_SUFX= .tar.xz 14EXTRACT_SUFX= .tar.xz
15 15
16MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
17HOMEPAGE= https://gcc.gnu.org/ 17HOMEPAGE= https://gcc.gnu.org/
18COMMENT= The GNU Compiler Collection (GCC) - 8.0 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 8.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
24# Relocations result in a linker error on AArch64, but not x86. 24# Relocations result in a linker error on AArch64, but not x86.
25MKPIE_SUPPORTED= no 25MKPIE_SUPPORTED= no
 26CHECK_RELRO_SKIP+= ${GCC_PKGNAME}/lib/*
26 27
27NOT_FOR_PLATFORM= Interix-*-* Darwin-*-aarch64 28NOT_FOR_PLATFORM= Interix-*-* Darwin-*-aarch64
28 29
29USE_LANGUAGES= c99 c++ 30USE_LANGUAGES= c99 c++
30USE_TOOLS+= gmake makeinfo sed:run tar:build 31USE_TOOLS+= gmake makeinfo sed:run tar:build
31USE_TOOLS.NetBSD+= gsed 32USE_TOOLS.NetBSD+= gsed
32 33
33GNU_CONFIGURE= yes 34GNU_CONFIGURE= yes
34GNU_CONFIGURE_STRICT= no 35GNU_CONFIGURE_STRICT= no
35## Build outside ${WRKSRC} 36## Build outside ${WRKSRC}
36OBJDIR= ../build 37OBJDIR= ../build
37CONFIGURE_DIRS= ${OBJDIR} 38CONFIGURE_DIRS= ${OBJDIR}
38CONFIGURE_SCRIPT= ../${DISTNAME}/configure 39CONFIGURE_SCRIPT= ../${DISTNAME}/configure
@@ -119,27 +120,26 @@ CONFIGURE_ARGS.Darwin+= --disable-multil @@ -119,27 +120,26 @@ CONFIGURE_ARGS.Darwin+= --disable-multil
119CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH} 120CONFIGURE_ARGS.Darwin+= --with-sysroot=${OSX_SDK_PATH}
120.endif 121.endif
121CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld 122CONFIGURE_ARGS.NetBSD+= --with-gnu-ld --with-ld=/usr/bin/ld
122CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as 123CONFIGURE_ARGS.NetBSD+= --with-gnu-as --with-as=/usr/bin/as
123MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes 124MAKE_ENV.NetBSD+= ac_cv_func_clock_gettime=yes
124MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no 125MAKE_ENV.NetBSD+= ac_cv_func_gethostbyname_r=no
125MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no 126MAKE_ENV.NetBSD+= ac_cv_func_freelocale=no
126MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no 127MAKE_ENV.NetBSD+= ac_cv_func_newlocale=no
127MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no 128MAKE_ENV.NetBSD+= ac_cv_func_uselocale=no
128MAKE_ENV.SunOS+= ac_cv_func_mkostemp=no 129MAKE_ENV.SunOS+= ac_cv_func_mkostemp=no
129 130
130.if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly" 131.if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly"
131CONFIGURE_ARGS+= --disable-bootstrap 132CONFIGURE_ARGS+= --disable-bootstrap
132CHECK_RELRO_SKIP+= ${GCC_PKGNAME}/lib/* 
133.endif 133.endif
134 134
135.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386) 135.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
136CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486 136CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
137.endif 137.endif
138 138
139.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64) 139.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
140CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse 140CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse
141.endif 141.endif
142 142
143.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 143.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
144CONFIGURE_ARGS+= --with-dwarf2 144CONFIGURE_ARGS+= --with-dwarf2
145.endif 145.endif
cvs diff -r1.34 -r1.35 pkgsrc/lang/gcc9/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc9/Makefile 2021/10/12 13:46:15 1.34
+++ pkgsrc/lang/gcc9/Makefile 2022/03/10 16:43:11 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.34 2021/10/12 13:46:15 tnn Exp $ 1# $NetBSD: Makefile,v 1.35 2022/03/10 16:43:11 nia Exp $
2 2
3GCC_PKGNAME= gcc9 3GCC_PKGNAME= gcc9
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC9_DIST_VERSION} 6DISTNAME= gcc-${GCC9_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC9_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC9_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/gcc9-libs needs to be bumped to be at least 1 more than the 9## lang/gcc9-libs needs to be bumped to be at least 1 more than the
10## PKGREVISION of this package! 10## PKGREVISION of this package!
11PKGREVISION= 7 11PKGREVISION= 7
12CATEGORIES= lang 12CATEGORIES= lang
13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC9_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC9_VERSION}/}
14EXTRACT_SUFX= .tar.xz 14EXTRACT_SUFX= .tar.xz
@@ -18,26 +18,27 @@ HOMEPAGE= https://gcc.gnu.org/ @@ -18,26 +18,27 @@ HOMEPAGE= https://gcc.gnu.org/
18COMMENT= The GNU Compiler Collection (GCC) - Release 9 Series 18COMMENT= The GNU Compiler Collection (GCC) - Release 9 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
21# These are conditionally overwritten depending on the package options. 21# These are conditionally overwritten depending on the package options.
22DISTFILES= ${DEFAULT_DISTFILES} 22DISTFILES= ${DEFAULT_DISTFILES}
23EXTRACT_ONLY= ${DEFAULT_DISTFILES} 23EXTRACT_ONLY= ${DEFAULT_DISTFILES}
24 24
25USE_LANGUAGES= c c++ 25USE_LANGUAGES= c c++
26USE_TOOLS+= gmake makeinfo sed:run tar:build 26USE_TOOLS+= gmake makeinfo sed:run tar:build
27USE_TOOLS.NetBSD+= gsed 27USE_TOOLS.NetBSD+= gsed
28 28
29# Relocations result in a linker error on AArch64, but not x86. 29# Relocations result in a linker error on AArch64, but not x86.
30MKPIE_SUPPORTED= no 30MKPIE_SUPPORTED= no
 31CHECK_RELRO_SKIP+= ${GCC_PKGNAME}/lib/*
31 32
32GNU_CONFIGURE= yes 33GNU_CONFIGURE= yes
33GNU_CONFIGURE_STRICT= no # has several configure scripts 34GNU_CONFIGURE_STRICT= no # has several configure scripts
34OBJDIR= ${WRKDIR}/build 35OBJDIR= ${WRKDIR}/build
35CONFIGURE_DIRS= ${OBJDIR} 36CONFIGURE_DIRS= ${OBJDIR}
36CONFIGURE_SCRIPT= ../${DISTNAME}/configure 37CONFIGURE_SCRIPT= ../${DISTNAME}/configure
37GCC9_SUBPREFIX= gcc9 38GCC9_SUBPREFIX= gcc9
38GCC9_PREFIX= ${PREFIX}/${GCC9_SUBPREFIX} 39GCC9_PREFIX= ${PREFIX}/${GCC9_SUBPREFIX}
39GNU_CONFIGURE_PREFIX= ${GCC9_PREFIX} 40GNU_CONFIGURE_PREFIX= ${GCC9_PREFIX}
40INFO_FILES= yes 41INFO_FILES= yes
41CONFIGURE_ARGS+= --disable-libstdcxx-pch 42CONFIGURE_ARGS+= --disable-libstdcxx-pch
42CONFIGURE_ARGS+= --with-system-zlib 43CONFIGURE_ARGS+= --with-system-zlib
43CONFIGURE_ARGS.Linux+= --without-system-zlib # to prevent "-lz not found" 44CONFIGURE_ARGS.Linux+= --without-system-zlib # to prevent "-lz not found"
@@ -120,27 +121,26 @@ CONFIGURE_ARGS.Darwin+= --with-sysroot=$ @@ -120,27 +121,26 @@ CONFIGURE_ARGS.Darwin+= --with-sysroot=$
120CONFIGURE_ARGS+= --with-gnu-ld --with-ld=/usr/bin/ld 121CONFIGURE_ARGS+= --with-gnu-ld --with-ld=/usr/bin/ld
121CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/bin/as 122CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/bin/as
122MAKE_ENV+= ac_cv_func_clock_gettime=yes 123MAKE_ENV+= ac_cv_func_clock_gettime=yes
123MAKE_ENV+= ac_cv_func_gethostbyname_r=no 124MAKE_ENV+= ac_cv_func_gethostbyname_r=no
124MAKE_ENV+= ac_cv_func_freelocale=no 125MAKE_ENV+= ac_cv_func_freelocale=no
125MAKE_ENV+= ac_cv_func_newlocale=no 126MAKE_ENV+= ac_cv_func_newlocale=no
126MAKE_ENV+= ac_cv_func_uselocale=no 127MAKE_ENV+= ac_cv_func_uselocale=no
127.endif 128.endif
128 129
129MAKE_ENV.SunOS+= ac_cv_func_mkostemp=no 130MAKE_ENV.SunOS+= ac_cv_func_mkostemp=no
130 131
131.if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly" 132.if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly"
132CONFIGURE_ARGS+= --disable-bootstrap 133CONFIGURE_ARGS+= --disable-bootstrap
133CHECK_RELRO_SKIP+= ${GCC_PKGNAME}/lib/* 
134.endif 134.endif
135 135
136.if ${MACHINE_PLATFORM:MNetBSD-*-i386} || ${MACHINE_PLATFORM:MLinux-*-i386} 136.if ${MACHINE_PLATFORM:MNetBSD-*-i386} || ${MACHINE_PLATFORM:MLinux-*-i386}
137CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486 137CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
138.endif 138.endif
139 139
140.if ${MACHINE_PLATFORM:MNetBSD-*-x86_64} || ${MACHINE_PLATFORM:MLinux-*-x86_64} 140.if ${MACHINE_PLATFORM:MNetBSD-*-x86_64} || ${MACHINE_PLATFORM:MLinux-*-x86_64}
141CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse 141CONFIGURE_ARGS+= --with-arch=nocona --with-tune=nocona --with-fpmath=sse
142.endif 142.endif
143 143
144.if ${MACHINE_PLATFORM:MDarwin-[0-8].*-*} 144.if ${MACHINE_PLATFORM:MDarwin-[0-8].*-*}
145CONFIGURE_ARGS+= --with-dwarf2 145CONFIGURE_ARGS+= --with-dwarf2
146.endif 146.endif