[patch] 06-path-fixups-3.2m3.patch

06-path-fixups-3.2m3.patch (text/plain), 4.06 KB, created by Maik Schreiber on 2005-11-14 11:56:43 UTC

diff -uNr eclipse-sourceBuild-srcIncluded-3.2M3~/plugins/org.eclipse.core.filesystem.linux.x86/build.xml eclipse-sourceBuild-srcIncluded-3.2M3/plugins/org.eclipse.core.filesystem.linux.x86/build.xml
--- eclipse-sourceBuild-srcIncluded-3.2M3~/plugins/org.eclipse.core.filesystem.linux.x86/build.xml	2005-11-02 22:10:18.000000000 +0100
+++ eclipse-sourceBuild-srcIncluded-3.2M3/plugins/org.eclipse.core.filesystem.linux.x86/build.xml	2005-11-12 21:54:26.000000000 +0100
@@ -60,9 +60,14 @@
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
 		<mkdir dir="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_1.0.0"/>
+		<exec dir="../org.eclipse.core.filesystem/natives/unix/linux" executable="make"/>
+		<copy todir="os/linux/${basearch}" failonerror="true" overwrite="false">
+			<fileset dir="../org.eclipse.core.filesystem/natives/unix/linux" includes="*.so"/>
+		</copy>
 		<copy todir="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_1.0.0" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}" includes="META-INF/,os/,fragment.properties,about.html"			/>
 		</copy>
+		<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_1.0.0" includes="os/linux/${basearch}/*.so"/>
 <eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.filesystem.linux.x86_1.0.0" version="1.0.0"/>	</target>
 
 	<target name="build.zips" depends="init">
diff -uNr eclipse-sourceBuild-srcIncluded-3.2M3~/plugins/org.eclipse.help.webapp/build.xml eclipse-sourceBuild-srcIncluded-3.2M3/plugins/org.eclipse.help.webapp/build.xml
--- eclipse-sourceBuild-srcIncluded-3.2M3~/plugins/org.eclipse.help.webapp/build.xml	2005-11-02 22:10:19.000000000 +0100
+++ eclipse-sourceBuild-srcIncluded-3.2M3/plugins/org.eclipse.help.webapp/build.xml	2005-11-12 22:00:08.000000000 +0100
@@ -165,7 +165,7 @@
 		<java
 			classname="org.apache.jasper.JspC"
 			fork="true"
-			failonerror="false"
+			failonerror="true"
 			classpathref="jasper.classpath"
 			output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log">
 			<arg value="-v3" />
diff -uNr eclipse-sourceBuild-srcIncluded-3.2M3~/plugins/org.eclipse.update.core.linux/src/build.xml eclipse-sourceBuild-srcIncluded-3.2M3/plugins/org.eclipse.update.core.linux/src/build.xml
--- eclipse-sourceBuild-srcIncluded-3.2M3~/plugins/org.eclipse.update.core.linux/src/build.xml	2005-11-02 22:11:44.000000000 +0100
+++ eclipse-sourceBuild-srcIncluded-3.2M3/plugins/org.eclipse.update.core.linux/src/build.xml	2005-11-12 21:56:42.000000000 +0100
@@ -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>
\ Kein Zeilenumbruch am Dateiende.
+</project>