[pkgsrc/trunk]: pkgsrc/lang gcc8: deconditionalize CHECK_RELRO_SKIP

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e520db34eb7
branches:  trunk
changeset: 375247:8e520db34eb7
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Mar 10 16:43:11 2022 +0000

description:
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

diffstat:

 lang/gcc10/Makefile |  4 ++--
 lang/gcc6/Makefile  |  4 ++--
 lang/gcc7/Makefile  |  4 ++--
 lang/gcc8/Makefile  |  4 ++--
 lang/gcc9/Makefile  |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diffs (125 lines):

diff -r 25da3539a178 -r 8e520db34eb7 lang/gcc10/Makefile
--- a/lang/gcc10/Makefile       Thu Mar 10 16:40:30 2022 +0000
+++ b/lang/gcc10/Makefile       Thu Mar 10 16:43:11 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/10/12 13:46:14 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2022/03/10 16:43:11 nia Exp $
 
 GCC_PKGNAME=           gcc10
 PKGREVISION=           1
@@ -23,6 +23,7 @@
 
 # Relocations result in a linker error on AArch64, but not x86.
 MKPIE_SUPPORTED=       no
+CHECK_RELRO_SKIP+=     ${GCC_PKGNAME}/lib/*
 
 NOT_FOR_PLATFORM=      Interix-*-*
 
@@ -125,7 +126,6 @@
 
 .if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly"
 CONFIGURE_ARGS+=       --disable-bootstrap
-CHECK_RELRO_SKIP+=     ${GCC_PKGNAME}/lib/*
 .endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
diff -r 25da3539a178 -r 8e520db34eb7 lang/gcc6/Makefile
--- a/lang/gcc6/Makefile        Thu Mar 10 16:40:30 2022 +0000
+++ b/lang/gcc6/Makefile        Thu Mar 10 16:43:11 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2021/10/12 13:46:14 tnn Exp $
+# $NetBSD: Makefile,v 1.35 2022/03/10 16:43:11 nia Exp $
 
 GCC_PKGNAME=           gcc6
 .include               "version.mk"
@@ -23,6 +23,7 @@
 
 # Relocations result in a linker error on AArch64, but not x86.
 MKPIE_SUPPORTED=       no
+CHECK_RELRO_SKIP+=     ${GCC_PKGNAME}/lib/*
 
 NOT_FOR_PLATFORM=      Interix-*-*
 
@@ -134,7 +135,6 @@
 
 .if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly"
 CONFIGURE_ARGS+=       --disable-bootstrap
-CHECK_RELRO_SKIP+=     ${GCC_PKGNAME}/lib/*
 .endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
diff -r 25da3539a178 -r 8e520db34eb7 lang/gcc7/Makefile
--- a/lang/gcc7/Makefile        Thu Mar 10 16:40:30 2022 +0000
+++ b/lang/gcc7/Makefile        Thu Mar 10 16:43:11 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2021/10/12 13:46:14 tnn Exp $
+# $NetBSD: Makefile,v 1.43 2022/03/10 16:43:11 nia Exp $
 
 GCC_PKGNAME=           gcc7
 .include               "version.mk"
@@ -23,6 +23,7 @@
 
 # Relocations result in a linker error on AArch64, but not x86.
 MKPIE_SUPPORTED=       no
+CHECK_RELRO_SKIP+=     ${GCC_PKGNAME}/lib/*
 
 NOT_FOR_PLATFORM=      Interix-*-* Darwin-*-aarch64
 
@@ -124,7 +125,6 @@
 
 .if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly"
 CONFIGURE_ARGS+=       --disable-bootstrap
-CHECK_RELRO_SKIP+=     ${GCC_PKGNAME}/lib/*
 .endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
diff -r 25da3539a178 -r 8e520db34eb7 lang/gcc8/Makefile
--- a/lang/gcc8/Makefile        Thu Mar 10 16:40:30 2022 +0000
+++ b/lang/gcc8/Makefile        Thu Mar 10 16:43:11 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2021/10/12 13:46:15 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2022/03/10 16:43:11 nia Exp $
 
 GCC_PKGNAME=           gcc8
 .include               "version.mk"
@@ -23,6 +23,7 @@
 
 # Relocations result in a linker error on AArch64, but not x86.
 MKPIE_SUPPORTED=       no
+CHECK_RELRO_SKIP+=     ${GCC_PKGNAME}/lib/*
 
 NOT_FOR_PLATFORM=      Interix-*-* Darwin-*-aarch64
 
@@ -129,7 +130,6 @@
 
 .if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly"
 CONFIGURE_ARGS+=       --disable-bootstrap
-CHECK_RELRO_SKIP+=     ${GCC_PKGNAME}/lib/*
 .endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
diff -r 25da3539a178 -r 8e520db34eb7 lang/gcc9/Makefile
--- a/lang/gcc9/Makefile        Thu Mar 10 16:40:30 2022 +0000
+++ b/lang/gcc9/Makefile        Thu Mar 10 16:43:11 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2021/10/12 13:46:15 tnn Exp $
+# $NetBSD: Makefile,v 1.35 2022/03/10 16:43:11 nia Exp $
 
 GCC_PKGNAME=   gcc9
 .include "version.mk"
@@ -28,6 +28,7 @@
 
 # Relocations result in a linker error on AArch64, but not x86.
 MKPIE_SUPPORTED=       no
+CHECK_RELRO_SKIP+=     ${GCC_PKGNAME}/lib/*
 
 GNU_CONFIGURE=         yes
 GNU_CONFIGURE_STRICT=  no # has several configure scripts
@@ -130,7 +131,6 @@
 
 .if !empty(PKGSRC_COMPILER:Mclang) || ${OPSYS} == "DragonFly"
 CONFIGURE_ARGS+=       --disable-bootstrap
-CHECK_RELRO_SKIP+=     ${GCC_PKGNAME}/lib/*
 .endif
 
 .if ${MACHINE_PLATFORM:MNetBSD-*-i386} || ${MACHINE_PLATFORM:MLinux-*-i386}