Attachment #62108 for bug #92606

Lines 57-66 Link Here

(-)eclipse.orig/plugins/org.eclipse.core.resources.linux/build.xml (-1 / +6 lines)
57		57
58	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">	58	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
59	<mkdir dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0"/>	59	<mkdir dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0"/>
		60	<exec dir="./src" executable="make">
		61	</exec>
		62	<copy todir="os/linux/${basearch}" failonerror="true" overwrite="false">
		63	<fileset dir="src" includes="*.so"/>
		64	</copy>
60	<copy todir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" failonerror="true" overwrite="false">	65	<copy todir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" failonerror="true" overwrite="false">
61	<fileset dir="${basedir}" includes="os/,META-INF/,about.html" />	66	<fileset dir="${basedir}" includes="os/,META-INF/,about.html" />
62	</copy>	67	</copy>
63	<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/x86/*.so" />	68	<chmod perm="755" dir="${destination.temp.folder}/org.eclipse.core.resources.linux_3.1.0" includes="os/linux/${basearch}/*.so" />
64	</target>	69	</target>
65		70
66	<target name="build.zips" depends="init">	71	<target name="build.zips" depends="init">




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

Lines 30-36 Link Here

(-)eclipse.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh (-2 / +6 lines)
30	if [ "${JAVA_HOME}" = "" ]; then	30	if [ "${JAVA_HOME}" = "" ]; then
31	JAVA_HOME=/bluebird/teamswt/swt-builddir/jdk1.5.0	31	JAVA_HOME=/bluebird/teamswt/swt-builddir/jdk1.5.0
32	fi	32	fi
33	AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64	33	if [ "${AWT_LIB_PATH}" = "" ]; then
		34	AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64
		35	fi
34	XTEST_LIB_PATH=/usr/X11R6/lib64	36	XTEST_LIB_PATH=/usr/X11R6/lib64
35	if [ "${GECKO_SDK}" = "" ]; then	37	if [ "${GECKO_SDK}" = "" ]; then
36	GECKO_SDK=/mozilla/mozilla/1.7/amd64/gtk2/mozilla/dist/sdk	38	GECKO_SDK=/mozilla/mozilla/1.7/amd64/gtk2/mozilla/dist/sdk
Lines 48-54 Link Here
48	if [ "${JAVA_HOME}" = "" ]; then	50	if [ "${JAVA_HOME}" = "" ]; then
49	JAVA_HOME=/bluebird/teamswt/swt-builddir/IBMJava2-141	51	JAVA_HOME=/bluebird/teamswt/swt-builddir/IBMJava2-141
50	fi	52	fi
51	AWT_LIB_PATH=$JAVA_HOME/jre/bin	53	if [ "${AWT_LIB_PATH}" = "" ]; then
		54	AWT_LIB_PATH=$JAVA_HOME/jre/bin
		55	fi
52	XTEST_LIB_PATH=/usr/X11R6/lib	56	XTEST_LIB_PATH=/usr/X11R6/lib
53	if [ "${GECKO_SDK}" = "" ]; then	57	if [ "${GECKO_SDK}" = "" ]; then
54	GECKO_SDK=/mozilla/mozilla/1.4/linux_gtk2/mozilla/dist/sdk	58	GECKO_SDK=/mozilla/mozilla/1.4/linux_gtk2/mozilla/dist/sdk

Return to bug 92606

Lines 5-11 Link Here

(-)eclipse.orig/plugins/org.eclipse.update.core.linux/src/build.xml (-3 / +3 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"/>