From nobody Sun Dec 12 18:29:48 2021 X-Original-To: dev-commits-ports-branches@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 7880D18CCDA2; Sun, 12 Dec 2021 18:29:49 +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 4JBtTn1Xgxz3mVw; Sun, 12 Dec 2021 18:29:49 +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 14A0625E89; Sun, 12 Dec 2021 18:29:49 +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 1BCITmBq078931; Sun, 12 Dec 2021 18:29:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BCITmxn078930; Sun, 12 Dec 2021 18:29:48 GMT (envelope-from git) Date: Sun, 12 Dec 2021 18:29:48 GMT Message-Id: <202112121829.1BCITmxn078930@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mikael Urankar Subject: git: ce8e04db8b1a - 2021Q4 - java/openjfx14: fix build with non-default CCACHE_DIR List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2021Q4 X-Git-Reftype: branch X-Git-Commit: ce8e04db8b1aa8bf1a3135a38cfc3b4761de0f81 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639333789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sZvdyyrcQ6pbE99JuCVoYryfw1/HJfjs1A+oQV5Z8lY=; b=cCODj+w+SfAd+osNWapxHVK/XfBgcW4uxGdBIDXPNM4jIVyv1cvehum0tGP3KpiZmGA1zj CRRbtQy24TCYrLZ24wK5yiG4g+OWx3xTOiD2ezG4UpwX8P+NhWuh/OPICX1HtmUMEC7xlb JtcV94XP8bvUBMGeWfPmdo+AXkkHr0wgdnm9Zzw5oPKyZDgK6iFk+20tnEet8jtffnCbOk P+pIS81y4lPntDoxicm3a4iBv+iSqvoQr3gForyeTHC34j3BMBFiFNDTIkOS9cW1xZwGEO 9OYaRKP2UQp67DI3rt6Wv/dC8D2v7tmhe2kp2y/jRsaJmp7y8tl2QRNSeuqSkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639333789; a=rsa-sha256; cv=none; b=XIJWDLboxxoEeed1pSq3jBRcJnoCRHa159EzOazYY9VWxK/WgwhtLiE+MOQdTd/Vxq00nN PwVERrjuLG0jv10yI0hR0oNhMpR4YAML0lbatKjOSc/ymD9o8Yjs4Cy/3gz4nYG3QMWoPl yxiUcufFS1n0ehoSqisyhtF4f0CnLwRLMgZrvP7dt/BYOrSLtBpy4SWiIJ0Me/2obUoJp2 V8vbaNsHUthm3/3KW+gPShhVb+tHD1gTIiNE6FKGLzc2qfxfxaE1LvTxuUE/CRdsvT8UDC pMe6BFI2HZXwaunwF/LbPXcqx7QqLChxzpZWkKlKdE/RzgJDAI9B72uv5xhLLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce8e04db8b1aa8bf1a3135a38cfc3b4761de0f81 commit ce8e04db8b1aa8bf1a3135a38cfc3b4761de0f81 Author: Benjamin Takacs AuthorDate: 2021-12-12 17:53:29 +0000 Commit: Mikael Urankar CommitDate: 2021-12-12 18:29:40 +0000 java/openjfx14: fix build with non-default CCACHE_DIR In the build of openjfx14 CCACHE_DIR gets lost leading to build failures e.g. when building as nobody, so add it into ccwrapper and cxxwrapper. While here remove redundant ${SETENV} in do-build (${_GRADLE_RUN} already contains ${SETENV}) PR: 260215 (cherry picked from commit 4ddd25225aa38b53f02f4e5b95551cc7cd63647c) --- java/openjfx14/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile index 490e6d41126f..f45e6bc3408c 100644 --- a/java/openjfx14/Makefile +++ b/java/openjfx14/Makefile @@ -106,8 +106,8 @@ pre-patch: post-patch: @${MKDIR} ${WRKDIR}/bin - @${PRINTF} '#!/bin/sh\nexec ${CCACHE_BIN} ${CC} ${CFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/ccwrapper - @${PRINTF} '#!/bin/sh\nexec ${CCACHE_BIN} ${CXX} ${CXXFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/cxxwrapper + @${PRINTF} '#!/bin/sh\nexport CCACHE_DIR=${CCACHE_DIR}\nexec ${CCACHE_BIN} ${CC} ${CFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/ccwrapper + @${PRINTF} '#!/bin/sh\nexport CCACHE_DIR=${CCACHE_DIR}\nexec ${CCACHE_BIN} ${CXX} ${CXXFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/cxxwrapper @${CHMOD} +x ${WRKDIR}/bin/ccwrapper ${WRKDIR}/bin/cxxwrapper @${REINPLACE_CMD} -e 's|gcc|${WRKDIR}/bin/ccwrapper|g' \ -e 's|g\+\+|${WRKDIR}/bin/cxxwrapper|g' \ @@ -145,7 +145,7 @@ do-configure: # the java doc are not installed on FreeBSD so exclude the javadoc task # as it'll fail otherwise do-build: - @cd ${WRKSRC} && ${SETENV} ${_GRADLE_RUN} zips --exclude-task javadoc + @cd ${WRKSRC} && ${_GRADLE_RUN} zips --exclude-task javadoc # it's not recommended to install openjfx inside openjdk directory do-install: