diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2023-01-18 21:11:36 +0100 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2023-01-22 19:58:23 +0100 |
| commit | 55820d3f162a65b9d284f1a5541965733c415a36 (patch) | |
| tree | 3d9d1e4cfaf6ed54d596a8ddf42d51dce0c73eb5 /java/eclipse/Makefile | |
| parent | devel/mold: Mark as BROKEN (diff) | |
java/eclipse: fix build with clang 15
During an exp-run for llvm 15 (see bug 265425), it turned out that
java/eclipse failed to build with clang 15:
[INFO] [exec] Building GTK3 bindings:
[INFO] [exec] gmake[1]: Entering directory '/wrkdirs/usr/ports/java/eclipse/work/eclipse.platform.releng.aggregator-R4_24/eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.amd64/tmpdir'
...
[INFO] [exec] cc -O -Wall -fPIC -DSWT_VERSION=4952r11 -DFREEBSD -DGTK -I`pkg-config --variable=prefix gtk+-3.0`/include -I/usr/local/openjdk11/include -I/usr/local/openjdk11/include/freebsd -DJNI64 -m64 -Werror `pkg-config --cflags gtk+-3.0 gtk+-unix-print-3.0` -c os.c
[INFO] [exec] os.c:10086:31: error: passing arguments to a function without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype]
[INFO] [exec] rc = (jint)((jint (*)())arg0)(arg1, arg2, arg3);
[INFO] [exec] ^
[INFO] [exec] os.c:10098:31: error: passing arguments to a function without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype]
[INFO] [exec] rc = (jint)((jint (*)())arg0)(arg1, arg2);
[INFO] [exec] ^
[INFO] [exec] os.c:10704:33: error: passing arguments to a function without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype]
[INFO] [exec] rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4);
[INFO] [exec] ^
[INFO] [exec] os.c:10716:33: error: passing arguments to a function without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype]
[INFO] [exec] rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6);
[INFO] [exec] ^
[INFO] [exec] os.c:10728:33: error: passing arguments to a function without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype]
[INFO] [exec] rc = (jlong)((jlong (*)())arg0)(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
[INFO] [exec] ^
These -Werror warnings are in code generated by JNIGenerator, so they
cannot directly be fixed (at least not without hacking on JNIGenerator
itself).
Instead we need to add -Wno-deprecated-non-prototype for clang 15 and
higher. To achieve this, we have to pass CFLAGS to MAVEN_ENV, and adjust
the gtk build.sh script to respect the CFLAGS setting in the
environment.
PR: 269034
Approved by: jonc@chen.org.nz (maintainer)
MFH: 2023Q1
Diffstat (limited to 'java/eclipse/Makefile')
| -rw-r--r-- | java/eclipse/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index c51253580d9a..83ccfbd15d21 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -65,13 +65,19 @@ DESKTOP_ENTRIES="Eclipse" \ SUB_FILES= ${PORTNAME} -MAVEN_ENV= MAVEN_OPTS=-Xmx1024m CC=${CC} JAVA_HOME=${JAVA_HOME} HOME=${WRKDIR}/githome +MAVEN_ENV= MAVEN_OPTS=-Xmx1024m CC=${CC} CFLAGS="${CFLAGS}" JAVA_HOME=${JAVA_HOME} HOME=${WRKDIR}/githome MAVEN_ECLIPSE= -Dmaven.repo.local=${WRKDIR}/eclipse-maven-repo-${PORTVERSION} \ -Dnative=gtk.freebsd.${ARCH} \ -DforceContextQualifier=v${ECLIPSE_TSTAMP} ECLIPSE_RESULT= eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/products/org.eclipse.sdk.ide-freebsd.gtk.${ARCH}.tar.gz +.include <bsd.port.pre.mk> + +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150 +CFLAGS+= -Wno-deprecated-non-prototype +.endif + do-build: cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn --offline ${MAVEN_ECLIPSE} -DskipTests clean verify @@ -85,4 +91,4 @@ post-install: cd ${STAGEDIR}${PREFIX} && ${FIND} -s bin/${PORTNAME} share/${PORTNAME} -not -type d >> ${TMPPLIST} cd ${STAGEDIR}${PREFIX} && ${FIND} -ds share/${PORTNAME} -type d | ${SED} -e 's,^,@dir ,' >> ${TMPPLIST} -.include <bsd.port.mk> +.include <bsd.port.post.mk> |