CVS commit: pkgsrc/lang/gcc7

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr  1 14:08:15 UTC 2020

Modified Files:
        pkgsrc/lang/gcc7: Makefile

Log Message:
gcc7: reduce differences to gcc8

mostly, make dejagnu a TEST_DEPENDS


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/gcc7/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/gcc7/Makefile
diff -u pkgsrc/lang/gcc7/Makefile:1.30 pkgsrc/lang/gcc7/Makefile:1.31
--- pkgsrc/lang/gcc7/Makefile:1.30      Sun Mar 22 10:56:25 2020
+++ pkgsrc/lang/gcc7/Makefile   Wed Apr  1 14:08:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2020/03/22 10:56:25 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2020/04/01 14:08:14 wiz Exp $
 
 GCC_PKGNAME=           gcc7
 .include               "version.mk"
@@ -83,7 +83,7 @@ SUBST_SED.fixinc=     -e "s,\./fixinc.sh,-c 
 .include "options.mk"
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
-# native SSP conflicts with gcc's libssp
+# on NetBSD, use the native SSP code in libc
 CONFIGURE_ARGS+=       --disable-libssp
 # Match base libstdc++ major
 SUBST_CLASSES+=                libstdc
@@ -169,16 +169,8 @@ SUBST_SED.ccs=             -e 's,/usr/ccs/bin,/usr/
 pre-configure:
        ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
 
-TEST_TARGET=   -k check || ${TRUE}
-
-pre-test:
-       ${RUN}                                                  \
-       if runtest --version >/dev/null 2>/dev/null ; then      \
-               : ;                                             \
-       else                                                    \
-         ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite."; \
-         exit 1;                                               \
-       fi
+TEST_TARGET=   -j ${MAKE_JOBS} -k check || ${TRUE}
+TEST_DEPENDS+= dejagnu-[0-9]*:../../devel/dejagnu
 
 post-test:
        ${RUN} cd ${WRKSRC} && cd ${OBJDIR} &&          \