Attachment 246197 Details for Bug 442260 – Patch for eclipse.platform.swt to allow for compiling SWT on Solaris x86_64

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch for eclipse.platform.swt to allow for compiling SWT on Solaris x86_64

eclipse.platform.swt.patch (text/plain), 7.87 KB, created by Thorsten Heit

on 2014-08-21 08:37:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thorsten Heit

Created: 2014-08-21 08:37:47 EDT

Size: 7.87 KB

patch

obsolete

>diff -ur eclipse.platform.swt.orig/bundles/org.eclipse.swt/buildSWT.xml eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
>--- eclipse.platform.swt.orig/bundles/org.eclipse.swt/buildSWT.xml	2014-08-19 13:59:16.393107266 +0200
>+++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml	2014-08-19 14:02:42.784292488 +0200
>@@ -117,6 +117,10 @@
> 			<param name="library_count" value="8"/>
> 			<param name="fragment" value="org.eclipse.swt.gtk.solaris.x86"/>
> 		</antcall>
>+		<antcall target="check_fragment_libraries">
>+			<param name="library_count" value="6"/>
>+			<param name="fragment" value="org.eclipse.swt.gtk.solaris.x86_64"/>
>+		</antcall>
> 		<!-- Motif is not being built
> 		antcall target="check_fragment_libraries">
> 			<param name="library_count" value="9"/>
>@@ -274,6 +278,13 @@
> 			trust="true"
> 			outputproperty="m_solaris_x86_output"
> 			command="hostname"/>
>+		<sshexec host="${m_solaris_x86_64}" 
>+			username="swtbuild" 
>+			keyfile="${keyfile}" 
>+			failonerror="false"
>+			trust="true"
>+			outputproperty="m_solaris_x86_64_output"
>+			command="hostname"/>
> 			
> 		<sshexec host="${m_aix}" 
> 			username="swtbuild" 
>@@ -349,6 +360,12 @@
> 				<matches pattern="x${m_solaris_x86_output}*" string="x${m_solaris_x86}"/>
> 			</and>
> 		</condition>
>+		<condition property="m_solaris_x86_64_test" value="${success_msg}" else="${fail_msg}">
>+			<and>
>+				<length string="${m_solaris_x86_64_output}" when="greater" length="0"/>
>+				<matches pattern="x${m_solaris_x86_64_output}*" string="x${m_solaris_x86_64}"/>
>+			</and>
>+		</condition>
> 		<condition property="m_aix_test" value="${success_msg}" else="${fail_msg}">
> 			<and>
> 				<length string="${m_aix_output}" when="greater" length="0"/>
>@@ -378,12 +395,13 @@
> 		<echo>${m_linux_ppc64} - ${m_linux_ppc64_test}</echo>
> 		<echo>${m_solaris_sparc} - ${m_solaris_sparc_test}</echo>
> 		<echo>${m_solaris_x86} - ${m_solaris_x86_test}</echo>
>+		<echo>${m_solaris_x86_64} - ${m_solaris_x86_64_test}</echo>
> 		<echo>${m_aix} - ${m_aix_test}</echo>
> 		<echo>${m_hpux} - ${m_hpux_test}</echo>
> 		<echo>${m_mac} - ${m_mac_test}</echo>
> 		<echo>-------------------------</echo>
> 		<condition property="m_fail">
>-			<matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc_test} ${m_linux_ppc64_test} ${m_solaris_sparc_test} ${m_solaris_x86_test} ${m_aix_test} ${m_hpux_test} ${m_mac_test}"/>
>+			<matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc_test} ${m_linux_ppc64_test} ${m_solaris_sparc_test} ${m_solaris_x86_test} ${m_solaris_x86_64_test} ${m_aix_test} ${m_hpux_test} ${m_mac_test}"/>
> 		</condition>
> 		<fail if="m_fail" message="Failed"/>
> 	</target>
>diff -ur eclipse.platform.swt.orig/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.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2014-08-19 13:59:16.392167734 +0200
>+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2014-08-19 14:02:42.782956536 +0200
>@@ -54,7 +54,9 @@
> 		PROC=`uname -i`
> 		MAKEFILE=make_solaris.mak
> 		if [ "${MODEL}" = "" ]; then
>-			if uname -p > /dev/null 2>&1; then
>+			if [ "`isainfo -b`" = "64" ]; then
>+				MODEL=x86_64
>+			elif uname -p > /dev/null 2>&1; then
> 				MODEL=`uname -p`
> 			fi
> 		fi
>@@ -63,6 +65,10 @@
> 				MAKEFILE=make_solaris_x86.mak
> 				MAKE_TYPE=gmake
> 				;;
>+			"x86_64")
>+				MAKEFILE=make_solaris_x86_64.mak
>+				MAKE_TYPE=gmake
>+				;;
> 		esac
> 		;;
> 	"FreeBSD")
>@@ -258,6 +264,35 @@
> 			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
> 		fi
> 		;;
>+	"solaris.x86_64")
>+		if [ "${CC}" = "" ]; then
>+			export CC="cc -m64"
>+		fi
>+		if [ "${CXX}" = "" ]; then
>+			export CXX="CC -m64"
>+		fi
>+		if [ "${JAVA_HOME}" = "" ]; then
>+			export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/x86/ibm-java2-i386-50"
>+		fi
>+#		if [ "${MOZILLA_SDK}" = "" ]; then
>+#			export MOZILLA_SDK="/bluebird/teamswt/bog/mozilla/solaris_x86/1.7/mozilla/dist/sdk"
>+#		fi
>+#		if [ "${XULRUNNER_SDK}" = "" ]; then
>+#			export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.0.1/solaris-x86/mozilla/dist/sdk"
>+#		fi
>+#		if [ "${MOZILLA_INCLUDES}" = "" ]; then
>+#			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"
>+#		fi
>+#		if [ "${MOZILLA_LIBS}" = "" ]; then
>+#			export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
>+#		fi
>+#		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
>+#			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
>+#		fi
>+#		if [ "${XULRUNNER_LIBS}" = "" ]; then
>+#			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
>+#		fi
>+		;;
> 	"solaris.sparc64")
> #		export PATH="/export/home/SUNWspro/bin:/usr/ccs/bin:/usr/bin"
> 		if [ "${CC}" = "" ]; then
>@@ -466,8 +501,10 @@
> fi
> 
> if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES"  -a ${MODEL} != "sparc64" -a ${MODEL} != 'ia64' -a ${GTK_VERSION} != '3.0' ]; then
>-	echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
>-	MAKE_GNOME=make_gnome
>+	if [ "${SWT_OS}" != "solaris" -o "${MODEL}" != "x86_64" ]; then
>+		echo "libgnomeui-2.0 found, compiling SWT program support using GNOME"
>+		MAKE_GNOME=make_gnome
>+	fi
> else
> 	if [ ${GTK_VERSION} != '3.0' ]; then
> 		echo "libgnome-2.0 and libgnomeui-2.0 not found:"
>@@ -483,7 +520,7 @@
> 	echo "    *** Advanced graphics support using cairo will not be compiled."
> fi
> 
>-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ]; then
>+if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' -a ${MODEL} != 'x86_64' ]; then
> 	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
> 		MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
> 		MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
>diff -ur eclipse.platform.swt.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86_64.mak eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86_64.mak
>--- eclipse.platform.swt.orig/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86_64.mak	2014-08-18 09:32:32.774044432 +0200
>+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86_64.mak	2014-08-19 14:02:55.744356245 +0200
>@@ -51,7 +51,7 @@
> 
> CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
> 
>-AWT_LFLAGS = -G
>+AWT_LFLAGS = -G ${SWT_PTR_CFLAGS}
> AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt 
> 
> ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`
>@@ -73,7 +73,7 @@
> 	+w \
> 	-I. \
> 	-I$(JAVA_HOME)/include \
>-	-I$(JAVA_HOME)/include/linux \
>+	-I$(JAVA_HOME)/include/solaris \
> 	${SWT_PTR_CFLAGS}
> MOZILLALFLAGS =  -G
> MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
>@@ -93,7 +93,7 @@
> SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
> CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
> ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
>-GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
>+GNOME_OBJECTS = 
> MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
> XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
> XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
>@@ -104,10 +104,10 @@
> 		$(NATIVE_STATS) \
> 		-DLINUX -DGTK \
> 		-I$(JAVA_HOME)/include \
>-		-I$(JAVA_HOME)/include/linux \
>+		-I$(JAVA_HOME)/include/solaris \
> 		-KPIC \
> 		${SWT_PTR_CFLAGS}
>-LFLAGS = -G -KPIC 
>+LFLAGS = -G -KPIC ${SWT_PTR_CFLAGS}
> 
> ifndef NO_STRIP
> 	AWT_LFLAGS := $(AWT_LFLAGS) -s
>@@ -197,7 +197,7 @@
> make_gnome: $(GNOME_LIB)
> 
> $(GNOME_LIB): $(GNOME_OBJECTS)
>-	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
>+	# $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
> 
> gnome.o: gnome.c 
> 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c

Actions: View | Diff

Attachments on bug 442260: 246196 | 246197 | 246198