- fix powerpc64 build, with patches from Curtis Hamilton

daemonblade · Mar 25, 2019 · 11d0a9b · 11d0a9b
1 parent 90e902b
commit 11d0a9b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/bin/unpack-distfiles b/bin/unpack-distfiles
@@ -82,8 +82,15 @@ rename_arch ()
 		mv ${D} ${NEWNAME}
 	done
 
+	# Fixup binary locations
+	GTK_EXE="rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk"
+	rm -rf ${GTK_EXE}/linux
+	for ARCH in amd64 powerpc64
+	do
+		mkdir -p ${GTK_EXE}/freebsd/${ARCH}
+		touch ${GTK_EXE}/freebsd/${ARCH}/eclipse
+	done
 	# Clean up binaries
-	rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux
 	find . -name '*.so' -delete
 )
 

diff --git a/java-eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder b/java-eclipse/files/patch-eclipse.platform.releng.tychoeclipsebuilder
@@ -240,8 +240,8 @@ diff -ru eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
 
 -root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le
 -root.linux.gtk.ppc64le.permissions.755=eclipse
-+#root.freebsd.gtk.powerpc64=rootfiles/freebsd.gtk.powerpc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/powerpc64
-+#root.freebsd.gtk.powerpc64.permissions.755=eclipse
++root.freebsd.gtk.powerpc64=rootfiles/freebsd.gtk.powerpc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/powerpc64
++root.freebsd.gtk.powerpc64.permissions.755=eclipse
 
 -root.linux.gtk.x86_64=rootfiles/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
 -root.linux.gtk.x86_64.permissions.755=eclipse

diff --git a/java-eclipse/files/patch-eclipse.platform.swt b/java-eclipse/files/patch-eclipse.platform.swt
@@ -62,7 +62,19 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library
  fi
  case $MODEL in
  	"x86_64")
-@@ -194,7 +187,7 @@
+@@ -111,6 +104,11 @@
+ 		SWT_ARCH=x86
+ 		AWT_ARCH=i386
+ 		;;
++	"powerpc" | "powerpc64")
++		SWT_ARCH=ppc64
++		AWT_ARCH=ppc64
++		MODEL=`uname -p`
++		;;
+ 	*)
+ 		SWT_ARCH=$MODEL
+ 		AWT_ARCH=$MODEL
+@@ -194,7 +192,7 @@
 
 
  # For 64-bit CPUs, we have a switch
@@ -71,7 +83,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 +198,11 @@
+@@ -205,6 +203,11 @@
  		XLIB64="${XLIB64} -L/usr/lib64"
  		SWT_LFLAGS=-m64
  		export SWT_LFLAGS
@@ -83,7 +95,7 @@ diff -ru eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library
  	fi
  	export SWT_PTR_CFLAGS
  fi
-@@ -364,4 +362,4 @@
+@@ -364,4 +367,4 @@
  elif [ "${GTK_VERSION}" = "3.0" -o "${GTK_VERSION}" = "" ]; then
  	export GTK_VERSION="3.0"
  	func_build_gtk3 "$@"

diff --git a/java-eclipse/scripts/pre-build b/java-eclipse/scripts/pre-build
@@ -4,6 +4,7 @@
 #
 cd ${WRKSRC}
 
+ARCHS="amd64 powerpc64"
 TSTAMP="2019-03-21 00:45:11 +0000"
 
 # Create repo for jgit
@@ -13,3 +14,11 @@ then
 	git add .
 	git commit -q -m "java/eclipse" --date="format:iso8601:${TSTAMP}"
 fi
+
+# Create dummy destinations
+GTK_EXE="rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk"
+for A in ${ARCHS}
+do
+	mkdir -p ${GTK_EXE}/freebsd/${A}
+	touch ${GTK_EXE}/freebsd/${A}/eclipse
+done