From nobody Sun Dec 12 17:59:14 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 031E518E5BCF; Sun, 12 Dec 2021 17:59:16 +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 4JBspV6lybz3R10; Sun, 12 Dec 2021 17:59:14 +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 8A14E25792; Sun, 12 Dec 2021 17:59:14 +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 1BCHxEd4037609; Sun, 12 Dec 2021 17:59:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BCHxEtK037608; Sun, 12 Dec 2021 17:59:14 GMT (envelope-from git) Date: Sun, 12 Dec 2021 17:59:14 GMT Message-Id: <202112121759.1BCHxEtK037608@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: 4ddd25225aa3 - main - java/openjfx14: fix build with non-default CCACHE_DIR 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: 4ddd25225aa38b53f02f4e5b95551cc7cd63647c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639331955; 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=dvnqSKqOisvaEDZxer8nrjCB5OdXQurxH5dnGrebhII=; b=n3dtDN2a+1GXXgwFYPQZEqXX/Ae37EpvgMuINmJVkdFfb8Z6zwp35KZEsXmksfSIyciXJ7 XKBAcpMpEwdE45c9YfUEsyUoVk7dsXyNMjVTMjnRLOEXYecmqXHLnWykOblPE8mAMCf1r9 afqAIEsCkFirFwnLLL23VebDD9Gny+7DJtXb68PbTCPOVRFxkxGfhTDP91Yesa1aeijbNU P2IoRVgKQSQTIH1ax+Oajl6yxeCm4TAYOWBup1YWDhppSViLyzln9bT/w1cueN+g7drweY x1hhWaER7EBlYU8sn2bveESEsacKS+fy0bFrdmgRbdtNx56ZR2m3m51JuJOKvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639331955; a=rsa-sha256; cv=none; b=M4tiBcmPH4EK+7ygdkymuX+H5PPfUxnFlIvH7D08jNk1XpWy6uLFKq4bdyf1yPKj7+HTl0 Hai+64BBHsRTvFvLxBqk/REIpLhV6N5kVqkCSJ4Th3l4lJdr8k8HCWKjNbfUMncL8tLZh7 jMTMnNT36VUfoS8nGnMW0WrfghuZDo7Ycjbi9toedugXRlhDBXh+oDxcwZfHrGXXUOzCKW 6BkxiHoIpG/PqyGU4p/qgVtaOFgaJ6pbC99ihZnJD0EW8nBbru0BZfkKBsovGPzdUxlAEF sRRDE4nMsVWjOlsAR2EiciwBRIO1eBIzclx0ivQwsJC1aCnVgKP7yI73VXkJ6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ddd25225aa38b53f02f4e5b95551cc7cd63647c commit 4ddd25225aa38b53f02f4e5b95551cc7cd63647c Author: Benjamin Takacs AuthorDate: 2021-12-12 17:53:29 +0000 Commit: Mikael Urankar CommitDate: 2021-12-12 17:58:57 +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 --- java/openjfx14/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile index 23b37dc18147..b47c89f0a0d9 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: