CVS commit: pkgsrc/lang

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Mar 10 16:43:11 UTC 2022

Modified Files:
        pkgsrc/lang/gcc10: Makefile
        pkgsrc/lang/gcc6: Makefile
        pkgsrc/lang/gcc7: Makefile
        pkgsrc/lang/gcc8: Makefile
        pkgsrc/lang/gcc9: Makefile

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/gcc10/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/gcc6/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/lang/gcc7/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/gcc8/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/gcc9/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/gcc10/Makefile
diff -u pkgsrc/lang/gcc10/Makefile:1.14 pkgsrc/lang/gcc10/Makefile:1.15
--- pkgsrc/lang/gcc10/Makefile:1.14     Tue Oct 12 13:46:14 2021
+++ pkgsrc/lang/gcc10/Makefile  Thu Mar 10 16:43:11 2022
@@ -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 @@ EXTRACT_ONLY=         ${DEFAULT_DISTFILES}
 
 # 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 @@ MAKE_ENV.SunOS+=    ac_cv_func_mkostemp=no
 
 .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)

Index: pkgsrc/lang/gcc6/Makefile
diff -u pkgsrc/lang/gcc6/Makefile:1.34 pkgsrc/lang/gcc6/Makefile:1.35
--- pkgsrc/lang/gcc6/Makefile:1.34      Tue Oct 12 13:46:14 2021
+++ pkgsrc/lang/gcc6/Makefile   Thu Mar 10 16:43:11 2022
@@ -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 @@ EXTRACT_ONLY=         ${DEFAULT_DISTFILES}
 
 # 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 @@ MAKE_ENV.SunOS+=    ac_cv_func_mkostemp=no
 
 .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)

Index: pkgsrc/lang/gcc7/Makefile
diff -u pkgsrc/lang/gcc7/Makefile:1.42 pkgsrc/lang/gcc7/Makefile:1.43
--- pkgsrc/lang/gcc7/Makefile:1.42      Tue Oct 12 13:46:14 2021
+++ pkgsrc/lang/gcc7/Makefile   Thu Mar 10 16:43:11 2022
@@ -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 @@ DISTFILES=            ${DEFAULT_DISTFILES}
 
 # 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 @@ MAKE_ENV.SunOS+=    ac_cv_func_mkostemp=no
 
 .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)

Index: pkgsrc/lang/gcc8/Makefile
diff -u pkgsrc/lang/gcc8/Makefile:1.30 pkgsrc/lang/gcc8/Makefile:1.31
--- pkgsrc/lang/gcc8/Makefile:1.30      Tue Oct 12 13:46:15 2021
+++ pkgsrc/lang/gcc8/Makefile   Thu Mar 10 16:43:11 2022
@@ -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 @@ EXTRACT_ONLY=         ${DEFAULT_DISTFILES}
 
 # 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 @@ MAKE_ENV.SunOS+=    ac_cv_func_mkostemp=no
 
 .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)

Index: pkgsrc/lang/gcc9/Makefile
diff -u pkgsrc/lang/gcc9/Makefile:1.34 pkgsrc/lang/gcc9/Makefile:1.35
--- pkgsrc/lang/gcc9/Makefile:1.34      Tue Oct 12 13:46:15 2021
+++ pkgsrc/lang/gcc9/Makefile   Thu Mar 10 16:43:11 2022
@@ -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 @@ USE_TOOLS.NetBSD+=    gsed
 
 # 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 @@ MAKE_ENV.SunOS+=    ac_cv_func_mkostemp=no
 
 .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}