Attachment #76316 for bug #112537

Lines 60-68 Link Here

(-)eclipse.orig/plugins/org.eclipse.core.filesystem.linux.x86_64/build.xml (+5 lines)
60		60
61	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">	61	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
62	<mkdir dir="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_64_1.0.0.v20051114"/>	62	<mkdir dir="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_64_1.0.0.v20051114"/>
		63	<exec dir="../org.eclipse.core.filesystem/natives/unix/linux" executable="make"/>
		64	<copy todir="os/linux/${basearch}" failonerror="true" overwrite="false">
		65	<fileset dir="../org.eclipse.core.filesystem/natives/unix/linux" includes="*.so"/>
		66	</copy>
63	<copy todir="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_64_1.0.0.v20051114" failonerror="true" overwrite="false">	67	<copy todir="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_64_1.0.0.v20051114" failonerror="true" overwrite="false">
64	<fileset dir="${basedir}" includes="META-INF/,about.html,os/,fragment.properties" />	68	<fileset dir="${basedir}" includes="META-INF/,about.html,os/,fragment.properties" />
65	</copy>	69	</copy>
		70	<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_64_1.0.0.v20051114" includes="os/linux/${basearch}/*.so"/>
66	<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_64_1.0.0.v20051114" version="1.0.0.v20051114"/>	71	<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_64_1.0.0.v20051114" version="1.0.0.v20051114"/>
67	</target>	72	</target>

Lines 60-68 Link Here

(-)eclipse.orig/plugins/org.eclipse.core.filesystem.linux.x86/build.xml (+5 lines)
60		60
61	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">	61	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
62	<mkdir dir="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_1.0.0.v20051114"/>	62	<mkdir dir="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_1.0.0.v20051114"/>
		63	<exec dir="../org.eclipse.core.filesystem/natives/unix/linux" executable="make"/>
		64	<copy todir="os/linux/${basearch}" failonerror="true" overwrite="false">
		65	<fileset dir="../org.eclipse.core.filesystem/natives/unix/linux" includes="*.so"/>
		66	</copy>
63	<copy todir="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_1.0.0.v20051114" failonerror="true" overwrite="false">	67	<copy todir="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_1.0.0.v20051114" failonerror="true" overwrite="false">
64	<fileset dir="${basedir}" includes="META-INF/,os/,fragment.properties,about.html" />	68	<fileset dir="${basedir}" includes="META-INF/,os/,fragment.properties,about.html" />
65	</copy>	69	</copy>
		70	<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_1.0.0.v20051114" includes="os/linux/${basearch}/*.so"/>
66	<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_1.0.0.v20051114" version="1.0.0.v20051114"/>	71	<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_1.0.0.v20051114" version="1.0.0.v20051114"/>
67	</target>	72	</target>
68		73

Lines 177-183 Link Here

(-)eclipse.orig/plugins/org.eclipse.help.webapp/build.xml (-1 / +1 lines)
177	<java	177	<java
178	classname="org.apache.jasper.JspC"	178	classname="org.apache.jasper.JspC"
179	fork="true"	179	fork="true"
180	failonerror="false"	180	failonerror="true"
181	classpathref="jasper.classpath"	181	classpathref="jasper.classpath"
182	output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log">	182	output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log">
183	<arg value="-v3" />	183	<arg value="-v3" />




  <!-- 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/${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/"/>  
  

    <property name="header-path" value="${jdk-path}/../include"/>
    <property name="header-linux-path" value="${header-path}/linux" />

    	<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"/>

  </target>
  
  
</project>

Return to bug 112537

Lines 5-11 Link Here

(-)eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml (-5 / +5 lines)
5	<!-- Set a meaningful default value for when it is not. -->	5	<!-- Set a meaningful default value for when it is not. -->
6	<property name="eclipse-home" value="${basedir}/../.."/>	6	<property name="eclipse-home" value="${basedir}/../.."/>
7	<property name="jdk-path" value="${java.home}"/>	7	<property name="jdk-path" value="${java.home}"/>
8	<property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/x86/"/>	8	<property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${arch}/"/>
9	<property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>	9	<property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
10	<property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>	10	<property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
11		11
Lines 47-63 Link Here
47	<property name="header-path" value="${jdk-path}/../include"/>	47	<property name="header-path" value="${jdk-path}/../include"/>
48	<property name="header-linux-path" value="${header-path}/linux" />	48	<property name="header-linux-path" value="${header-path}/linux" />
49		49
50	<echo message="gcc -o ${library-file} -shared -I${src-path} -I${header-linux-path} ${library-file} -static -lc"/>	50	<echo message="gcc -o ${library-file} -shared -fPIC -I${src-path} -I${header-linux-path} ${library-file} -lc"/>
51		51
52	<apply executable="gcc" dest="${eclipse-home}/" parallel="false">	52	<apply executable="gcc" dest="${eclipse-home}/" parallel="false">
53	<arg value="-o"/>	53	<arg value="-o"/>
54	<arg value="${library-file}"/>	54	<arg value="${library-file}"/>
55	<arg value="-shared"/>	55	<arg value="-shared"/>
		56	<arg value="-fPIC"/>
56	<arg value="-I${src-path}"/>	57	<arg value="-I${src-path}"/>
57	<arg value="-I${header-path}"/>	58	<arg value="-I${header-path}"/>
58	<arg value="-I${header-linux-path}"/>	59	<arg value="-I${header-linux-path}"/>
59	<srcfile/>	60	<srcfile/>
60	<arg value="-static"/>
61	<arg value="-lc"/>	61	<arg value="-lc"/>
62	<fileset dir="${src-path}" includes="*.c"/>	62	<fileset dir="${src-path}" includes="*.c"/>
63	<mapper type="glob" from=".c" to=".o"/>	63	<mapper type="glob" from=".c" to=".o"/>
Lines 67-70 Link Here
67	</target>	67	</target>
68		68
69		69
70	</project>	70	</project>