From nobody Sat Nov 13 15:19:55 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B23C7185D72E; Sat, 13 Nov 2021 15:19:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hrzf33WKtz4TwT; Sat, 13 Nov 2021 15:19:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B74115B22; Sat, 13 Nov 2021 15:19:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ADFJt76063748; Sat, 13 Nov 2021 15:19:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ADFJtpY063747; Sat, 13 Nov 2021 15:19:55 GMT (envelope-from git) Date: Sat, 13 Nov 2021 15:19:55 GMT Message-Id: <202111131519.1ADFJtpY063747@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: c77faeee3ec0 - main - devel/bazel: Unbreak on aarch64. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c77faeee3ec0056573a33e3bc850f5187b1789c4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=c77faeee3ec0056573a33e3bc850f5187b1789c4 commit c77faeee3ec0056573a33e3bc850f5187b1789c4 Author: William Muir AuthorDate: 2021-11-13 14:30:34 +0000 Commit: Mikael Urankar CommitDate: 2021-11-13 15:11:27 +0000 devel/bazel: Unbreak on aarch64. Set initial and max Java heap to 128M and 1G respectively when building Bazel under aarch64. PR: 229420 --- devel/bazel/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/devel/bazel/Makefile b/devel/bazel/Makefile index 834f332f1f40..cd1a9a740744 100644 --- a/devel/bazel/Makefile +++ b/devel/bazel/Makefile @@ -12,7 +12,6 @@ COMMENT= Fast and correct build system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_aarch64= fails to build: java.lang.OutOfMemoryError: Java heap space BROKEN_armv6= fails to package: cp: bazel: No such file or directory BROKEN_armv7= fails to package: cp: bazel: No such file or directory BROKEN_FreeBSD_12_powerpc64= fails to compile: Action failed to execute: java.io.IOException: Cannot run program /usr/bin/clang @@ -49,6 +48,10 @@ FINALRC= 2 EXTRA_PATCHES+= ${FILESDIR}/extra-i386_tools_cpp_BUILD.static.bsd .endif +.if ${ARCH} == "aarch64" +BAZEL_JAVAC_OPTS+= "-J-Xmx1g -J-Xms128m" +.endif + pre-patch: @${CP} ${FILESDIR}/extra-patch-absl_base_internal_unscaledcycleclock.cc \ ${FILESDIR}/extra-patch-bazel_grpc__deps.bzl \ @@ -83,6 +86,7 @@ do-build: EMBED_LABEL='${PORTVERSION}' \ PATH=${LOCALBASE}/bin:$$PATH \ SOURCE_DATE_EPOCH=$${SOURCE_DATE_EPOCH} \ + BAZEL_JAVAC_OPTS=${BAZEL_JAVAC_OPTS} \ EXTRA_BAZEL_ARGS=--host_javabase=@local_jdk//:jdk \ ${LOCALBASE}/bin/bash ./compile.sh)