rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Add patch for 64-bit platforms to build SWT

This commit is contained in:
Andrew Overholt 2008-07-18 21:04:11 +00:00
parent 72e3fc572e
commit 5e493d7202
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
eclipse-compilelibs-64bit.patch Normal file
View File

@ -0,0 +1,31 @@
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">

6
eclipse.spec
View File

@ -109,6 +109,8 @@ Patch29: %{name}-memorypermsizeandjvmcrash.patch
# 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 @@ Eclipse Plugin Development Environment runtime plugin (org.eclipse.pde.runtime).
%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 @@ fi
- 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@redhat.com> 3.4.0-3
- Generate metadata and provision each sub-package