Received: by mail.netbsd.org (Postfix, from userid 605) id 76A2E84D32; Tue, 24 Mar 2020 20:41:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F1F8C84CEF for ; Tue, 24 Mar 2020 20:41:58 +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 2n6I1S9CTuUX for ; Tue, 24 Mar 2020 20:41:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 802AE84CE3 for ; Tue, 24 Mar 2020 20:41:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7D635FB27; Tue, 24 Mar 2020 20:41:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1585082518223360" MIME-Version: 1.0 Date: Tue, 24 Mar 2020 20:41:58 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200324204158.7D635FB27@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. --_----------=_1585082518223360 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Tue Mar 24 20:41:58 UTC 2020 Modified Files: pkgsrc/mk: java-vm.mk Log Message: datasize limits for VMs should also be matched by VM limits. To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 pkgsrc/mk/java-vm.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1585082518223360 Content-Disposition: inline Content-Length: 1697 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/java-vm.mk diff -u pkgsrc/mk/java-vm.mk:1.118 pkgsrc/mk/java-vm.mk:1.119 --- pkgsrc/mk/java-vm.mk:1.118 Mon Jan 13 01:53:50 2020 +++ pkgsrc/mk/java-vm.mk Tue Mar 24 20:41:58 2020 @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.118 2020/01/13 01:53:50 ryoon Exp $ +# $NetBSD: java-vm.mk,v 1.119 2020/03/24 20:41:58 joerg Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -296,12 +296,12 @@ _JAVA_HOME= ${LOCALBASE}/java/openjdk8 _JDK_PKGSRCDIR= ../../lang/sun-jdk7 _JRE_PKGSRCDIR= ../../lang/sun-jre7 _JAVA_HOME= ${LOCALBASE}/java/sun-7 -UNLIMIT_RESOURCES+= datasize +UNLIMIT_RESOURCES+= datasize virtualsize .elif ${_PKG_JVM} == "oracle-jdk8" _JDK_PKGSRCDIR= ../../lang/oracle-jdk8 _JRE_PKGSRCDIR= ../../lang/oracle-jre8 _JAVA_HOME= ${LOCALBASE}/java/oracle-8 -UNLIMIT_RESOURCES+= datasize +UNLIMIT_RESOURCES+= datasize virtualsize .elif ${_PKG_JVM} == "adoptopenjdk11-bin" _JDK_PKGSRCDIR= ../../lang/adoptopenjdk11-bin _JRE_PKGSRCDIR= ../../lang/adoptopenjdk11-bin @@ -310,12 +310,12 @@ _JAVA_HOME= ${LOCALBASE}/java/adoptopen _JDK_PKGSRCDIR= ../../lang/openjdk-bin _JRE_PKGSRCDIR= ../../lang/openjdk-bin _JAVA_HOME= ${LOCALBASE}/java/openjdk-bin -UNLIMIT_RESOURCES+= datasize +UNLIMIT_RESOURCES+= datasize virtualsize .elif ${_PKG_JVM} == "openjdk11" _JDK_PKGSRCDIR= ../../lang/openjdk11 _JRE_PKGSRCDIR= ../../lang/openjdk11 _JAVA_HOME= ${LOCALBASE}/java/openjdk11 -UNLIMIT_RESOURCES+= datasize +UNLIMIT_RESOURCES+= datasize virtualsize .endif # If we are not using Java for building, then we need a run-time dependency on --_----------=_1585082518223360--