diff options
| -rw-r--r-- | java/eclipse/Makefile | 10 | ||||
| -rw-r--r-- | java/eclipse/files/patch-eclipse.platform.swt | 7 |
2 files changed, 13 insertions, 4 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> diff --git a/java/eclipse/files/patch-eclipse.platform.swt b/java/eclipse/files/patch-eclipse.platform.swt index dc00b69720aa..f767ccd32b14 100644 --- a/java/eclipse/files/patch-eclipse.platform.swt +++ b/java/eclipse/files/patch-eclipse.platform.swt @@ -53,15 +53,18 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 0000-00-00 00:00:00.000000000 +0000 -@@ -72,7 +72,7 @@ +@@ -72,9 +72,9 @@ cd `dirname $0` -MAKE_TYPE=make +MAKE_TYPE=gmake - export CFLAGS='-O -Wall -fPIC' +-export CFLAGS='-O -Wall -fPIC' ++export CFLAGS="${CFLAGS--O -Wall} -fPIC" + # Determine which OS we are on + if [ "${OS}" = "" ]; then @@ -86,27 +86,30 @@ MAKEFILE=make_win32.mak ;; |