Received: by mail.netbsd.org (Postfix, from userid 605) id AF31F84DCA; Tue, 1 Oct 2019 14:54:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 34E4584D78 for ; Tue, 1 Oct 2019 14:54:32 +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 27UZ4d-1rCD6 for ; Tue, 1 Oct 2019 14:54:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 86A9984CD3 for ; Tue, 1 Oct 2019 14:54:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 80207FBF4; Tue, 1 Oct 2019 14:54:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1569941671212540" MIME-Version: 1.0 Date: Tue, 1 Oct 2019 14:54:31 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/lang/openjdk7 To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20191001145431.80207FBF4@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. --_----------=_1569941671212540 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Tue Oct 1 14:54:31 UTC 2019 Modified Files: pkgsrc/lang/openjdk7: Makefile Log Message: openjdk7: invert GCC>=6 conditional to make it more future proof To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 pkgsrc/lang/openjdk7/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1569941671212540 Content-Disposition: inline Content-Length: 858 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/openjdk7/Makefile diff -u pkgsrc/lang/openjdk7/Makefile:1.137 pkgsrc/lang/openjdk7/Makefile:1.138 --- pkgsrc/lang/openjdk7/Makefile:1.137 Sun Sep 22 14:47:00 2019 +++ pkgsrc/lang/openjdk7/Makefile Tue Oct 1 14:54:31 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.137 2019/09/22 14:47:00 tnn Exp $ +# $NetBSD: Makefile,v 1.138 2019/10/01 14:54:31 tnn Exp $ JDK_MICRO= 141 DISTNAME= openjdk-1.7.${JDK_MICRO}-20170813 @@ -137,7 +137,7 @@ SUBST_SED.mapfix2= -e '/environ/d' CFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS CXXFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -.if !empty(CC_VERSION:Mgcc-[67].*) +.if !empty(PKGSRC_COMPILER:Mgcc) && empty(CC_VERSION:Mgcc-[2345].*) CFLAGS+= -fno-lifetime-dse CFLAGS+= -fno-delete-null-pointer-checks .endif --_----------=_1569941671212540--