Attachment 229893 Details for Bug 260215 – java/openjfx14: fix build with non-default CCACHE_DIR

[patch] java/openjfx14: fix build with non-default CCACHE_DIR

openjfx14-ccache-dir-fix.diff (text/plain), 1.23 KB, created by Benjamin Takacs on 2021-12-04 14:09:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Takacs

Created: 2021-12-04 14:09:10 UTC

Size: 1.23 KB

patch

obsolete

>diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile
>index 23b37dc181..b47c89f0a0 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:

Flags:

nimaje+fbz: maintainer-approval? (mikael)

Actions: View | Diff

Attachments on bug 260215: 229893