lang/gcc*: skip some RELRO checks when --disable-boostrap

This relates to the case when GCC is built using clang host CC. In that
case the runtime libraries are not built with RELRO for some reason.

for the gcc*-libs/ packages, mark them as RELRO_SUPPORTED=no unconditionally.
RELRO status depends on how the parent gcc package was built so we don't
need nor care about the RELRO status here.

10 files changed, 39 insertions, 34 deletions

diff --git a/lang/gcc10-libs/Makefile b/lang/gcc10-libs/Makefile
index a09d9e919e2..ce3ca870432 100644
--- a/lang/gcc10-libs/Makefile
+++ b/lang/gcc10-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/04/16 15:03:42 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2021/10/12 13:46:14 tnn Exp $
 
 GCC_PKGNAME=	gcc10
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -22,8 +22,9 @@ LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 
 USE_TOOLS+=	pax
 
-NO_BUILD=	yes
-CHECK_SHLIBS=	no
+NO_BUILD=		yes
+CHECK_SHLIBS=		no
+RELRO_SUPPORTED=	no
 
 ## Depend on exactly ${GCC10_DIST_VERSION}.
 BUILD_DEPENDS+=		${GCC_PKGNAME}-${GCC10_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc10
diff --git a/lang/gcc10/Makefile b/lang/gcc10/Makefile
index a0e140de34d..ebde7822629 100644
--- a/lang/gcc10/Makefile
+++ b/lang/gcc10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/10/01 11:49:59 nia Exp $
+# $NetBSD: Makefile,v 1.14 2021/10/12 13:46:14 tnn Exp $
 
 GCC_PKGNAME=		gcc10
 PKGREVISION=		1
@@ -123,9 +123,9 @@ MAKE_ENV.NetBSD+=	ac_cv_func_newlocale=no
 MAKE_ENV.NetBSD+=	ac_cv_func_uselocale=no
 MAKE_ENV.SunOS+=	ac_cv_func_mkostemp=no
 
-CONFIGURE_ARGS.DragonFly+=	--disable-bootstrap
-.if !empty(PKGSRC_COMPILER:Mclang)
+.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 --git a/lang/gcc6-libs/Makefile b/lang/gcc6-libs/Makefile
index d7a3206b4cf..e962574c100 100644
--- a/lang/gcc6-libs/Makefile
+++ b/lang/gcc6-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/02/13 15:56:16 maya Exp $
+# $NetBSD: Makefile,v 1.16 2021/10/12 13:46:14 tnn Exp $
 
 GCC_PKGNAME=	gcc6
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -22,8 +22,9 @@ LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 
 USE_TOOLS+=	pax
 
-NO_BUILD=	yes
-CHECK_SHLIBS=	no
+NO_BUILD=		yes
+CHECK_SHLIBS=		no
+RELRO_SUPPORTED=	no
 
 ## Depend on exactly ${GCC6_DIST_VERSION}.
 BUILD_DEPENDS+=		${GCC_PKGNAME}-${GCC6_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc6
diff --git a/lang/gcc6/Makefile b/lang/gcc6/Makefile
index 34a41fe602f..8ddd691e691 100644
--- a/lang/gcc6/Makefile
+++ b/lang/gcc6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2021/10/01 11:49:59 nia Exp $
+# $NetBSD: Makefile,v 1.34 2021/10/12 13:46:14 tnn Exp $
 
 GCC_PKGNAME=		gcc6
 .include		"version.mk"
@@ -132,9 +132,9 @@ MAKE_ENV.NetBSD+=	ac_cv_func_newlocale=no
 MAKE_ENV.NetBSD+=	ac_cv_func_uselocale=no
 MAKE_ENV.SunOS+=	ac_cv_func_mkostemp=no
 
-CONFIGURE_ARGS.DragonFly+=	--disable-bootstrap
-.if !empty(PKGSRC_COMPILER:Mclang)
-CONFIGURE_ARGS+=		--disable-bootstrap
+.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 --git a/lang/gcc7-libs/Makefile b/lang/gcc7-libs/Makefile
index 5d9595f9179..ac9e37c0a8c 100644
--- a/lang/gcc7-libs/Makefile
+++ b/lang/gcc7-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/02/13 15:56:16 maya Exp $
+# $NetBSD: Makefile,v 1.13 2021/10/12 13:46:14 tnn Exp $
 
 GCC_PKGNAME=	gcc7
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -22,8 +22,9 @@ LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 
 USE_TOOLS+=	pax
 
-NO_BUILD=	yes
-CHECK_SHLIBS=	no
+NO_BUILD=		yes
+CHECK_SHLIBS=		no
+RELRO_SUPPORTED=	no
 
 ## Depend on exactly ${GCC7_DIST_VERSION}.
 BUILD_DEPENDS+=		${GCC_PKGNAME}-${GCC7_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc7
diff --git a/lang/gcc7/Makefile b/lang/gcc7/Makefile
index 8d22178cb77..16c8e1b44d9 100644
--- a/lang/gcc7/Makefile
+++ b/lang/gcc7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2021/10/01 11:49:59 nia Exp $
+# $NetBSD: Makefile,v 1.42 2021/10/12 13:46:14 tnn Exp $
 
 GCC_PKGNAME=		gcc7
 .include		"version.mk"
@@ -122,9 +122,9 @@ MAKE_ENV.NetBSD+=	ac_cv_func_newlocale=no
 MAKE_ENV.NetBSD+=	ac_cv_func_uselocale=no
 MAKE_ENV.SunOS+=	ac_cv_func_mkostemp=no
 
-CONFIGURE_ARGS.DragonFly+=	--disable-bootstrap
-.if !empty(PKGSRC_COMPILER:Mclang)
-CONFIGURE_ARGS+=		--disable-bootstrap
+.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 --git a/lang/gcc8-libs/Makefile b/lang/gcc8-libs/Makefile
index 4d121ddd041..cc1645096bb 100644
--- a/lang/gcc8-libs/Makefile
+++ b/lang/gcc8-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/02/13 15:56:17 maya Exp $
+# $NetBSD: Makefile,v 1.13 2021/10/12 13:46:15 tnn Exp $
 
 GCC_PKGNAME=	gcc8
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -22,8 +22,9 @@ LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 
 USE_TOOLS+=	pax
 
-NO_BUILD=	yes
-CHECK_SHLIBS=	no
+NO_BUILD=		yes
+CHECK_SHLIBS=		no
+RELRO_SUPPORTED=	no
 
 ## Depend on exactly ${GCC8_DIST_VERSION}.
 BUILD_DEPENDS+=		${GCC_PKGNAME}-${GCC8_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc8
diff --git a/lang/gcc8/Makefile b/lang/gcc8/Makefile
index e19858b78e6..f5bc83ffe66 100644
--- a/lang/gcc8/Makefile
+++ b/lang/gcc8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2021/10/01 11:49:59 nia Exp $
+# $NetBSD: Makefile,v 1.30 2021/10/12 13:46:15 tnn Exp $
 
 GCC_PKGNAME=		gcc8
 .include		"version.mk"
@@ -127,9 +127,9 @@ MAKE_ENV.NetBSD+=	ac_cv_func_newlocale=no
 MAKE_ENV.NetBSD+=	ac_cv_func_uselocale=no
 MAKE_ENV.SunOS+=	ac_cv_func_mkostemp=no
 
-CONFIGURE_ARGS.DragonFly+=	--disable-bootstrap
-.if !empty(PKGSRC_COMPILER:Mclang)
-CONFIGURE_ARGS+=		--disable-bootstrap
+.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 --git a/lang/gcc9-libs/Makefile b/lang/gcc9-libs/Makefile
index 0f25dfc0ab8..384f08fc625 100644
--- a/lang/gcc9-libs/Makefile
+++ b/lang/gcc9-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/02/13 15:56:17 maya Exp $
+# $NetBSD: Makefile,v 1.5 2021/10/12 13:46:15 tnn Exp $
 
 GCC_PKGNAME=	gcc9
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -22,8 +22,9 @@ LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 
 USE_TOOLS+=	pax
 
-NO_BUILD=	yes
-CHECK_SHLIBS=	no
+NO_BUILD=		yes
+CHECK_SHLIBS=		no
+RELRO_SUPPORTED=	no
 
 ## Depend on exactly ${GCC9_DIST_VERSION}.
 BUILD_DEPENDS+=		${GCC_PKGNAME}-${GCC9_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc9
diff --git a/lang/gcc9/Makefile b/lang/gcc9/Makefile
index 44de124d2f7..163197123df 100644
--- a/lang/gcc9/Makefile
+++ b/lang/gcc9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2021/10/01 11:49:59 nia Exp $
+# $NetBSD: Makefile,v 1.34 2021/10/12 13:46:15 tnn Exp $
 
 GCC_PKGNAME=	gcc9
 .include "version.mk"
@@ -128,9 +128,9 @@ MAKE_ENV+=		ac_cv_func_uselocale=no
 
 MAKE_ENV.SunOS+=	ac_cv_func_mkostemp=no
 
-CONFIGURE_ARGS.DragonFly+=	--disable-bootstrap
-.if !empty(PKGSRC_COMPILER:Mclang)
-CONFIGURE_ARGS+=		--disable-bootstrap
+.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}