diff options
| author | Steve Wills <swills@FreeBSD.org> | 2019-05-27 16:03:34 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2019-05-27 16:03:34 +0000 |
| commit | 953906fc5e9a9f38584a71de45744a697dd396eb (patch) | |
| tree | 083e08cd3622f2bd4055593916d6c2203b00f17e /java/eclipse/files/patch-eclipse.platform.swt | |
| parent | misc/tzdiff: update to 1.1.1 (diff) | |
java/eclipse: Fix build when using maven-3.6.1
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)
Diffstat (limited to 'java/eclipse/files/patch-eclipse.platform.swt')
| -rw-r--r-- | java/eclipse/files/patch-eclipse.platform.swt | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/java/eclipse/files/patch-eclipse.platform.swt b/java/eclipse/files/patch-eclipse.platform.swt index 7f36e50af40b..ae14686cb214 100644 --- a/java/eclipse/files/patch-eclipse.platform.swt +++ b/java/eclipse/files/patch-eclipse.platform.swt @@ -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 "$@" |