[patch] Patch to eclipse build files to allow amd64 compilation on gentoo

eclipse-amd64.patch (text/plain), 7.69 KB, created by Mikko Tiihonen on 2005-05-23 13:58:05 UTC

diff -ur eclipse.orig/build eclipse.amd64/build
--- eclipse.orig/build	2005-05-13 21:38:39.000000000 +0300
+++ eclipse.amd64/build	2005-05-23 21:50:52.000000000 +0300
@@ -56,9 +56,9 @@
 then
         ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH
         ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
-        CLASSPATH=$PWD/jdtcoresrc/ecj.jar:$CLASSPATH;export CLASSPATH
+        LOCALCLASSPATH=$PWD/jdtcoresrc/ecj.jar:$CLASSPATH;export LOCALCLASSPATH
         ant -q -buildfile jdtcoresrc/compilejdtcore.xml
-        CLASSPATH=$PWD/ecj.jar:$ORIGCLASSPATH;export CLASSPATH
+        LOCALCLASSPATH=$PWD/ecj.jar:$ORIGCLASSPATH;export LOCALCLASSPATH
 		ant -q -buildfile build.xml $target -DinstallOs=$os -DinstallWs=$ws -DinstallArch=$arch $compilelibs $bootclasspath 
 else
 	echo "The os-ws-arch combination of $os-$ws-$arch is not valid."
diff -ur eclipse.orig/build.xml eclipse.amd64/build.xml
--- eclipse.orig/build.xml	2005-05-13 21:38:39.000000000 +0300
+++ eclipse.amd64/build.xml	2005-05-23 21:43:30.000000000 +0300
@@ -53,7 +53,7 @@
 		<exec dir="${swtlibs}/" executable="sh" failonerror="true">
 			<arg line="build.sh"/>
 		</exec>
-		<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.{installOs}.{installArch}"/>
+		<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}"/>
 		<mkdir dir="${swtdir}"/>
 		<move todir="${swtdir}/">
 			<fileset dir="${swtlibs}">
@@ -160,8 +160,8 @@
 				</condition>
 		</fail>
 		<property name="compilerArg" value="-encoding ISO-8859-1" />
-		<property name="javacSource" value="1.3" />
-		<property name="javacTarget" value="1.2" />
+		<property name="javacSource" value="1.4" />
+		<property name="javacTarget" value="1.4" />
 		<property name="javacDebugInfo" value="true" />
 		<property name="javacFailOnError" value="true" />
 		
diff -ur eclipse.orig/plugins/org.eclipse.core.resources.linux/build.xml eclipse.amd64/plugins/org.eclipse.core.resources.linux/build.xml
--- eclipse.orig/plugins/org.eclipse.core.resources.linux/build.xml	2005-05-13 21:34:52.000000000 +0300
+++ eclipse.amd64/plugins/org.eclipse.core.resources.linux/build.xml	2005-05-23 21:43:30.000000000 +0300
@@ -57,10 +57,15 @@
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
 		<mkdir dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0"/>
+          <exec dir="./src" executable="make">
+          </exec>
+	  <copy todir="os/linux/${basearch}" failonerror="true" overwrite="false">
+        	<fileset dir="src" includes="*.so"/>
+          </copy>
 		<copy todir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}" includes="os/,META-INF/,about.html"			/>
 		</copy>
-		<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/x86/*.so" /> 
+		<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/${basearch}/*.so" /> 
 	</target>
 
 	<target name="build.zips" depends="init">
diff -ur eclipse.orig/plugins/org.eclipse.core.resources.linux/src/Makefile eclipse.amd64/plugins/org.eclipse.core.resources.linux/src/Makefile
--- eclipse.orig/plugins/org.eclipse.core.resources.linux/src/Makefile	2005-05-13 21:35:34.000000000 +0300
+++ eclipse.amd64/plugins/org.eclipse.core.resources.linux/src/Makefile	2005-05-23 21:43:30.000000000 +0300
@@ -17,12 +17,12 @@
 OS_TYPE = linux
 
 #Set this to be the location of your JRE
-JAVA_HOME = ~/vm/sun142
+#JAVA_HOME = ~/vm/sun142
 
 JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}
 
 core :
-	gcc -fPIC -g -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C)
+	gcc -O2 -fPIC -g -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C)
 	gcc -g -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc
 
 clean :
diff -ur eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh eclipse.amd64/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
--- eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2005-05-13 21:37:09.000000000 +0300
+++ eclipse.amd64/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2005-05-23 21:47:22.000000000 +0300
@@ -128,4 +128,4 @@
 
 export CC LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR
 
-make -f $makefile ${1} ${2} ${3} ${4}
+make -f $makefile ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9}
diff -ur eclipse.orig/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml eclipse.amd64/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
--- eclipse.orig/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml	2005-05-13 21:34:53.000000000 +0300
+++ eclipse.amd64/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml	2005-05-23 21:49:16.000000000 +0300
@@ -38,7 +38,7 @@
 		<property name="destdir" value="${temp.folder}/@dot.bin"/>
 		<delete dir="${temp.folder}/@dot.bin"/>
 		<mkdir dir="${temp.folder}/@dot.bin"/>
-		<javac destdir="${temp.folder}/@dot.bin" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}" source="1.3" target="1.2">
+		<javac destdir="${temp.folder}/@dot.bin" verbose="true" debug="on" failonerror="no" bootclasspath="${bootclasspath}" source="1.4" target="1.4">
 			<src path="${basedir}/src/Eclipse SWT/cairo/"/>
 			<src path="${basedir}/src/Eclipse SWT/common/"/>
 			<src path="${basedir}/src/Eclipse SWT/common_j2se/"/>
diff -ur eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml eclipse.amd64/plugins/org.eclipse.update.core.linux/src/build.xml
--- eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml	2005-05-13 21:37:28.000000000 +0300
+++ eclipse.amd64/plugins/org.eclipse.update.core.linux/src/build.xml	2005-05-23 21:43:30.000000000 +0300
@@ -5,7 +5,7 @@
   <!-- Set a meaningful default value for when it is not. -->
   <property name="eclipse-home" value="${basedir}/../.."/>
   <property name="jdk-path" value="${java.home}"/>  
-  <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/x86/"/>
+  <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${arch}/"/>
   <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
   <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>  
   
@@ -47,17 +47,17 @@
     <property name="header-path" value="${jdk-path}/../include"/>
     <property name="header-linux-path" value="${header-path}/linux" />
 
-	<echo message="gcc -o  ${library-file} -shared -I${src-path} -I${header-linux-path} ${library-file} -static -lc"/>
+	<echo message="gcc -o  ${library-file} -shared -fPIC -I${src-path} -I${header-linux-path} ${library-file} -lc"/>
 
     <apply executable="gcc" dest="${eclipse-home}/" parallel="false">
       <arg value="-o"/>
       <arg value="${library-file}"/>
       <arg value="-shared"/>
+      <arg value="-fPIC"/>
       <arg value="-I${src-path}"/>
       <arg value="-I${header-path}"/>      
       <arg value="-I${header-linux-path}"/>  
 	  <srcfile/>
-	  <arg value="-static"/>           
       <arg value="-lc"/>	  
       <fileset dir="${src-path}" includes="*.c"/>
       <mapper type="glob" from="*.c" to="*.o"/>
@@ -67,4 +67,4 @@
   </target>
   
   
-</project>
\ No newline at end of file
+</project>
--- eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	2005-05-13 21:35:33.000000000 +0300
+++ eclipse.amd64/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	2005-05-23 22:17:35.000000000 +0300
@@ -86,7 +86,7 @@
 LIBS = -shared -fpic -s
 
 
-all: make_swt make_atk make_gnome make_awt
+all: make_swt make_atk make_gnome make_awt make_cairo make_mozilla
 
 #
 # SWT libs