freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

java/eclipse: Fix build when using maven-3.6.1

Browse Source 
While here, fix powerpc64 build and remove pkg-plist for dynamic plist
to cater for multiple ARCH builds.

PR:		238152
Submitted by:	Jonathan Chen <jonc@chen.org.nz> (maintainer)
This commit is contained in:
Steve Wills
2019-05-27 16:03:34 +00:00
parent f1613cffae
commit 953906fc5e
7 changed files with 39 additions and 1118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
java/eclipse/files/patch-eclipse.pde.build
View File

@@ -51,27 +51,3 @@ diff -ru eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/interna
if ("win32".equalsIgnoreCase(os)) //$NON-NLS-1$
return "Windows"; //$NON-NLS-1$
if ("macosx".equalsIgnoreCase(os)) //$NON-NLS-1$
diff -ru eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml
--- eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml 0000-00-00 00:00:00.000000000 +0000
+++ eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml 0000-00-00 00:00:00.000000000 +0000
@@ -19,9 +19,9 @@
</ant>
</target>
- <target name="assemble.linux.gtk.x86_64.xml">
+ <target name="assemble.freebsd.gtk.amd64.xml">
<ant antfile="${assembleScriptName}" >
- <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/>
+ <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/>
</ant>
</target>
diff -ru eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties
--- eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties 0000-00-00 00:00:00.000000000 +0000
+++ eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties 0000-00-00 00:00:00.000000000 +0000
@@ -19,4 +19,4 @@
root.permissions.755=eclipse,*.so*
root.win32.win32.x86_64=eclipse.exe, eclipsec.exe
-root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
+root.freebsd.gtk.amd64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm

13
java/eclipse/files/patch-eclipse.platform.releng
View File

@@ -69,3 +69,16 @@ diff -ru eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml e
<plugin id="org.eclipse.core.resources.win32.x86_64"/>
</excludes>
</configuration>
diff -ru eclipse.platform.releng/pom.xml eclipse.platform.releng/pom.xml
--- eclipse.platform.releng/pom.xml 0000-00-00 00:00:00.000000000 +0000
+++ eclipse.platform.releng/pom.xml 0000-00-00 00:00:00.000000000 +0000
@@ -66,7 +66,9 @@
<module>features/org.eclipse.releng.tools</module>
<module>features/org.eclipse.sdk</module>
<module>features/org.eclipse.sdk.examples-feature</module>
+<!--
<module>features/org.eclipse.sdk.tests</module>
+-->
<module>features/org.eclipse.test-feature</module>
</modules>

23
java/eclipse/files/patch-eclipse.platform.swt
View File

@@ -74,7 +74,24 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library
*)
SWT_ARCH=$MODEL
AWT_ARCH=$MODEL
@@ -194,7 +192,7 @@
@@ -118,6 +116,16 @@
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
+ export JAVA_HOME
+ fi
+ ;;
"linux.x86")
if [ "${CC}" = "" ]; then
export CC=gcc
@@ -194,7 +202,7 @@
# For 64-bit CPUs, we have a switch
@@ -83,7 +100,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library
SWT_PTR_CFLAGS=-DJNI64
if [ -d /lib64 ]; then
XLIB64=-L/usr/X11R6/lib64
@@ -205,6 +203,11 @@
@@ -205,6 +213,11 @@
XLIB64="${XLIB64} -L/usr/lib64"
SWT_LFLAGS=-m64
export SWT_LFLAGS
@@ -95,7 +112,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library
fi
export SWT_PTR_CFLAGS
fi
@@ -364,4 +367,4 @@
@@ -364,4 +377,4 @@
elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then
export GTK_VERSION="3.0"
func_build_gtk3 "$@"