svn commit: r504379 - in head/java/eclipse: . files

[Piotr Kubaj]

Author: pkubaj
Date: Sun Jun 16 22:58:16 2019
New Revision: 504379
URL: https://svnweb.freebsd.org/changeset/ports/504379

Log:
  java/eclipse: fix build
  
  Require new GCC to build this port on GCC architectures.
  
  PR:		238489
  Approved by:	jonc at chen.org.nz (maintainer), tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D20667

Modified:
  head/java/eclipse/Makefile
  head/java/eclipse/files/patch-eclipse.platform.swt

Modified: head/java/eclipse/Makefile
==============================================================================
--- head/java/eclipse/Makefile	Sun Jun 16 22:29:03 2019	(r504378)
+++ head/java/eclipse/Makefile	Sun Jun 16 22:58:16 2019	(r504379)
@@ -54,7 +54,7 @@ BUILD_DEPENDS=	git:devel/git-lite \
 		${LOCALBASE}/share/java/maven/bin/mvn:devel/maven
 LIB_DEPENDS=	libsecret-1.so:security/libsecret \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
-USES=		gmake pkgconfig gnome
+USES=		compiler:c++11-lang gmake pkgconfig gnome
 USE_GNOME=	gtk30
 
 USE_GITHUB=	yes
@@ -74,7 +74,7 @@ DESKTOP_ENTRIES="Eclipse" \
 
 SUB_FILES=	${PORTNAME}
 
-MAVEN_ENV=	MAVEN_OPTS=-Xmx1024m
+MAVEN_ENV=	MAVEN_OPTS=-Xmx1024m CC=${CC}
 MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/${GH_PROJECT}-${PORTVERSION}
 MAVEN_ECLIPSE=	-Dnative=gtk.freebsd.${ARCH} -Dcomparator.repo=file://${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/p2-stub -DforceContextQualifier=v${ECLIPSE_TSTAMP}
 

Modified: head/java/eclipse/files/patch-eclipse.platform.swt
==============================================================================
--- head/java/eclipse/files/patch-eclipse.platform.swt	Sun Jun 16 22:29:03 2019	(r504378)
+++ head/java/eclipse/files/patch-eclipse.platform.swt	Sun Jun 16 22:58:16 2019	(r504379)
@@ -74,14 +74,11 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/
  	*)
  		SWT_ARCH=$MODEL
  		AWT_ARCH=$MODEL
-@@ -118,6 +116,16 @@
+@@ -118,6 +116,13 @@
  esac
  
  case $SWT_OS.$SWT_ARCH in
 +	"freebsd.ppc64")
-+		if [ "${CC}" = "" ]; then
-+			export CC=gcc
-+		fi
 +		if [ "${JAVA_HOME}" = "" ]; then
 +			DYNAMIC_JAVA_HOME=`readlink -f /usr/local/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
 +			JAVA_HOME = $DYNAMIC_JAVA_HOME