Received: by mail.netbsd.org (Postfix, from userid 605) id 4DE5E84D94; Wed, 1 Apr 2020 14:08:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CD10B84D93 for ; Wed, 1 Apr 2020 14:08:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id cObHN67CSLPS for ; Wed, 1 Apr 2020 14:08:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2D9D384CCD for ; Wed, 1 Apr 2020 14:08:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 276A0FB27; Wed, 1 Apr 2020 14:08:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1585750095193690" MIME-Version: 1.0 Date: Wed, 1 Apr 2020 14:08:15 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/lang/gcc7 To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20200401140815.276A0FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1585750095193690 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1585750095193690 Content-Disposition: inline Content-Length: 1263 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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} && \ --_----------=_1585750095193690--