pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/gcc7 gcc7: reduce differences to gcc8



details:   https://anonhg.NetBSD.org/pkgsrc/rev/33aa61055429
branches:  trunk
changeset: 414757:33aa61055429
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Apr 01 14:08:14 2020 +0000

description:
gcc7: reduce differences to gcc8

mostly, make dejagnu a TEST_DEPENDS

diffstat:

 lang/gcc7/Makefile |  16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diffs (37 lines):

diff -r e75c9c57937d -r 33aa61055429 lang/gcc7/Makefile
--- a/lang/gcc7/Makefile        Wed Apr 01 13:44:18 2020 +0000
+++ b/lang/gcc7/Makefile        Wed Apr 01 14:08:14 2020 +0000
@@ -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 @@
 .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 @@
 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} &&          \



Home | Main Index | Thread Index | Old Index