diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2017-07-13 15:46:36 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2017-07-13 15:46:36 +0000 |
| commit | b746e136edfc237e1c5eea9f258eb8a0d4ef07da (patch) | |
| tree | e1e4176a7fae7b9edbf64c4bec6e0005d74029f6 /java/openjfx8-devel | |
| parent | 50dca6498739cfe8c643eb13b22a2d15907c2541 (diff) | |
| download | ports-b746e136edfc237e1c5eea9f258eb8a0d4ef07da.tar.gz ports-b746e136edfc237e1c5eea9f258eb8a0d4ef07da.zip | |
Fix build of java/openjfx8-devel with Gradle 4.0
PR: 220322
Approved by: mat (mentor)
Differential Revision: https://reviews.freebsd.org/D11565
Notes
Notes:
svn path=/head/; revision=445658
Diffstat (limited to 'java/openjfx8-devel')
| -rw-r--r-- | java/openjfx8-devel/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/openjfx8-devel/Makefile b/java/openjfx8-devel/Makefile index ed8f212070d9..c9437251a5c0 100644 --- a/java/openjfx8-devel/Makefile +++ b/java/openjfx8-devel/Makefile @@ -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} \ |