Date: Thu, 13 Jul 2017 15:46:36 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445658 - head/java/openjfx8-devel Message-ID: <201707131546.v6DFkaxw040554@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Thu Jul 13 15:46:36 2017 New Revision: 445658 URL: https://svnweb.freebsd.org/changeset/ports/445658 Log: Fix build of java/openjfx8-devel with Gradle 4.0 PR: 220322 Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D11565 Modified: head/java/openjfx8-devel/Makefile Modified: head/java/openjfx8-devel/Makefile ============================================================================== --- head/java/openjfx8-devel/Makefile Thu Jul 13 15:46:06 2017 (r445657) +++ head/java/openjfx8-devel/Makefile Thu Jul 13 15:46:36 2017 (r445658) @@ -43,12 +43,16 @@ WRKSRC= ${WRKDIR}/tobik-openjfx-rt-2de985ca8377 # non-pristine environment. post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle +# Fix build directories which are now language specific with Gradle 4.0 + @${REINPLACE_CMD} -E -e 's|%%PREFIX%%|${PREFIX}|g' \ + -e 's|"(\$$buildDir/classes)/main"|"\1/java/main"|g' \ + -e 's|"(modules/.*/build/classes)/main"|"\1/java/main"|g' \ + ${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle do-build: # Gradle creates ${HOME}/.gradle, pretend home is somewhere else @${MKDIR} ${WRKDIR}/dot-gradle - @(cd ${WRKSRC}; ${SETENV} GRADLE_USER_HOME=${WRKDIR}/dot-gradle gradle zips) + @(cd ${WRKSRC}; ${SETENV} GRADLE_USER_HOME=${WRKDIR}/dot-gradle gradle --no-daemon zips) do-install: @(${MKDIR} ${STAGEDIR}${JAVA_HOME} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707131546.v6DFkaxw040554>