rpms/eclipse/devel eclipse-compilelibs-64bit.patch, NONE, 1.1 eclipse.spec, 1.542, 1.543

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25766

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-compilelibs-64bit.patch 
Log Message:
* Fri Jul 18 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-4
- Add patch for 64-bit platforms to build SWT

eclipse-compilelibs-64bit.patch:

--- NEW FILE eclipse-compilelibs-64bit.patch ---
diff -up ./build.xml.swtx86_64 ./build.xml
--- ./build.xml.swtx86_64	2008-07-18 16:56:02.000000000 -0400
+++ ./build.xml	2008-07-18 16:56:50.000000000 -0400
@@ -72,26 +72,7 @@
 	</target>
 
 	<target name="compilelibs" depends="init,clean,compile" if="libsconfig">
-		<property name="swtlibs" value="${buildDirectory}/swttmp" />
-		<mkdir dir="${swtlibs}" />
-
-		<!-- unzip swt zips -->
-		<ant antfile="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}/build.xml" target="src.zip" dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
-		<unzip dest="${swtlibs}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" >
-				<include name="src.zip" />
-			</fileset>
-		</unzip>
-		<exec dir="${swtlibs}/" executable="sh" failonerror="true">
-			<arg line="build.sh" />
-		</exec>
-		<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
-		<mkdir dir="${swtdir}" />
-		<move todir="${swtdir}/">
-			<fileset dir="${swtlibs}">
-				<include name="**/*.so" />
-			</fileset>
-		</move>
+		<ant antfile="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}/build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
 	
 		<property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
 		<exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true">


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -r1.542 -r1.543
--- eclipse.spec	18 Jul 2008 17:15:23 -0000	1.542
+++ eclipse.spec	18 Jul 2008 21:04:11 -0000	1.543
@@ -109,6 +109,8 @@
 # https://bugs.eclipse.org/bugs/attachment.cgi?id=105593
 # FIXME:  update bug with this smaller version of the patch
 Patch32:        %{name}-compilelibs.patch
+# 64-bit systems need to generate the 64-bit JNI code first
+Patch38:        %{name}-compilelibs-64bit.patch
 
 # FIXME:  file these upstream
 # Upstream builds with a 1.4 (or lower) class library
@@ -302,6 +304,9 @@
 %setup -q -c
 
 %patch32 -p4
+%ifarch x86_64 ppc64 sparc64 ia64 s390x
+%patch38
+%endif
 
 sed --in-place "s/java5.home/java.home/" build.xml
 # Build swttools.jar
@@ -1340,6 +1345,7 @@
 - Un-do crazy config.ini, bundles.info, etc. shuffling
 - Update patch for building native libraries
 - Re-add missing BR on tomcat5-jasper-eclipse
+- Add patch for 64-bit platforms to build SWT
 
 * Thu Jul 17 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-3
 - Generate metadata and provision each sub-package