pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/lang



Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Oct 12 13:46:15 UTC 2021

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/gcc10/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc10-libs/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/lang/gcc6/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/gcc6-libs/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/lang/gcc7/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/gcc7-libs/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/gcc8/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/gcc8-libs/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/lang/gcc9/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc9-libs/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.13 pkgsrc/lang/gcc10/Makefile:1.14
--- pkgsrc/lang/gcc10/Makefile:1.13     Fri Oct  1 11:49:59 2021
+++ pkgsrc/lang/gcc10/Makefile  Tue Oct 12 13:46:14 2021
@@ -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=n
 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)

Index: pkgsrc/lang/gcc10-libs/Makefile
diff -u pkgsrc/lang/gcc10-libs/Makefile:1.3 pkgsrc/lang/gcc10-libs/Makefile:1.4
--- pkgsrc/lang/gcc10-libs/Makefile:1.3 Fri Apr 16 15:03:42 2021
+++ pkgsrc/lang/gcc10-libs/Makefile     Tue Oct 12 13:46:14 2021
@@ -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 g
 
 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

Index: pkgsrc/lang/gcc6/Makefile
diff -u pkgsrc/lang/gcc6/Makefile:1.33 pkgsrc/lang/gcc6/Makefile:1.34
--- pkgsrc/lang/gcc6/Makefile:1.33      Fri Oct  1 11:49:59 2021
+++ pkgsrc/lang/gcc6/Makefile   Tue Oct 12 13:46:14 2021
@@ -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=n
 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)

Index: pkgsrc/lang/gcc6-libs/Makefile
diff -u pkgsrc/lang/gcc6-libs/Makefile:1.15 pkgsrc/lang/gcc6-libs/Makefile:1.16
--- pkgsrc/lang/gcc6-libs/Makefile:1.15 Sat Feb 13 15:56:16 2021
+++ pkgsrc/lang/gcc6-libs/Makefile      Tue Oct 12 13:46:14 2021
@@ -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 g
 
 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

Index: pkgsrc/lang/gcc7/Makefile
diff -u pkgsrc/lang/gcc7/Makefile:1.41 pkgsrc/lang/gcc7/Makefile:1.42
--- pkgsrc/lang/gcc7/Makefile:1.41      Fri Oct  1 11:49:59 2021
+++ pkgsrc/lang/gcc7/Makefile   Tue Oct 12 13:46:14 2021
@@ -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=n
 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)

Index: pkgsrc/lang/gcc7-libs/Makefile
diff -u pkgsrc/lang/gcc7-libs/Makefile:1.12 pkgsrc/lang/gcc7-libs/Makefile:1.13
--- pkgsrc/lang/gcc7-libs/Makefile:1.12 Sat Feb 13 15:56:16 2021
+++ pkgsrc/lang/gcc7-libs/Makefile      Tue Oct 12 13:46:14 2021
@@ -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 g
 
 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

Index: pkgsrc/lang/gcc8/Makefile
diff -u pkgsrc/lang/gcc8/Makefile:1.29 pkgsrc/lang/gcc8/Makefile:1.30
--- pkgsrc/lang/gcc8/Makefile:1.29      Fri Oct  1 11:49:59 2021
+++ pkgsrc/lang/gcc8/Makefile   Tue Oct 12 13:46:15 2021
@@ -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=n
 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)

Index: pkgsrc/lang/gcc8-libs/Makefile
diff -u pkgsrc/lang/gcc8-libs/Makefile:1.12 pkgsrc/lang/gcc8-libs/Makefile:1.13
--- pkgsrc/lang/gcc8-libs/Makefile:1.12 Sat Feb 13 15:56:17 2021
+++ pkgsrc/lang/gcc8-libs/Makefile      Tue Oct 12 13:46:15 2021
@@ -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 g
 
 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

Index: pkgsrc/lang/gcc9/Makefile
diff -u pkgsrc/lang/gcc9/Makefile:1.33 pkgsrc/lang/gcc9/Makefile:1.34
--- pkgsrc/lang/gcc9/Makefile:1.33      Fri Oct  1 11:49:59 2021
+++ pkgsrc/lang/gcc9/Makefile   Tue Oct 12 13:46:15 2021
@@ -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}

Index: pkgsrc/lang/gcc9-libs/Makefile
diff -u pkgsrc/lang/gcc9-libs/Makefile:1.4 pkgsrc/lang/gcc9-libs/Makefile:1.5
--- pkgsrc/lang/gcc9-libs/Makefile:1.4  Sat Feb 13 15:56:17 2021
+++ pkgsrc/lang/gcc9-libs/Makefile      Tue Oct 12 13:46:15 2021
@@ -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 g
 
 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



Home | Main Index | Thread Index | Old Index