Description Billy Biggs 2005-05-26 14:45:47 EDT

From http://bugs.gentoo.org/attachment.cgi?id=59659, there are some problems
with the build.xml for Linux.

  1. It hardcodes x86 instead of using ${arch} which will break on ppc
     and x86-64.
  2. It passes both -shared and -static to gcc, which confuses newer versions.
     Only pass -shared (and -fPIC).

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>