add support for ppc64, s390, s390x

This commit is contained in:
Ben Konrath 2006-06-06 02:17:30 +00:00
parent bc6236bcf7
commit e17f27b6fe
2 changed files with 51 additions and 3 deletions

View File

@ -0,0 +1,23 @@
Index: customBuildCallbacks.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.platform.doc.isv/customBuildCallbacks.xml,v
retrieving revision 1.5
diff -u -r1.5 customBuildCallbacks.xml
--- customBuildCallbacks.xml 14 Dec 2005 00:07:22 -0000 1.5
+++ customBuildCallbacks.xml 5 Jun 2006 01:18:34 -0000
@@ -80,6 +80,15 @@
</target>
<!-- ===================================================================== -->
+ <!-- Steps to do before the target gather.bin.parts -->
+ <!-- Available parameters : -->
+ <!-- destination.temp.folder - the directory plugins will be collected to -->
+ <!-- feature.directory - the directory containing the resulting feature -->
+ <!-- ===================================================================== -->
+ <target name="pre.gather.bin.parts">
+ </target>
+
+ <!-- ===================================================================== -->
<!-- Steps to do after the target gather.bin.parts -->
<!-- Available parameters : -->
<!-- base.dir - root of the project -->

View File

@ -45,7 +45,7 @@ Source0: http://download.eclipse.org/eclipse/downloads/drops/S-3.2RC7-2006060213
Source2: %{name}.desktop Source2: %{name}.desktop
Source5: %{name}-48.png Source5: %{name}-48.png
Source6: %{name}.conf Source6: %{name}.conf
Source11: %{name}-fedora-splash-3.2rc6.png Source11: %{name}-fedora-splash-3.2rc7.png
Source16: %{name}-copy-platform.sh Source16: %{name}-copy-platform.sh
Source17: %{name}-efj-wrapper.sh Source17: %{name}-efj-wrapper.sh
%if %{redhat} %if %{redhat}
@ -127,9 +127,14 @@ Patch54: %{name}-swt-rm-ON_TOP.patch
# We need to disable junit4 and apt until GCJ can handle Java5 code # We need to disable junit4 and apt until GCJ can handle Java5 code
Patch55: %{name}-disable-junit4-apt.patch Patch55: %{name}-disable-junit4-apt.patch
# these patches should be in 3.2 final
Patch60: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
Patch61: org.eclipse.platform.doc.isv-rm-org.eclipse.ui.workbench-Eclipse-UI-Components.patch
%if %{gcj_support} %if %{gcj_support}
ExcludeArch: ppc64 s390 s390x ExcludeArch: s390 s390x ppc64
%else %else
ExclusiveArch: %{ix86} x86_64 ppc ia64 ExclusiveArch: %{ix86} x86_64 ppc ia64
%endif %endif
@ -368,6 +373,14 @@ Source for RCP for use within Eclipse.
%prep %prep
%setup -q -c %setup -q -c
pushd plugins/org.eclipse.platform.doc.isv
%patch60 -p0
%patch61 -p0
popd
pushd plugins/org.eclipse.platform.doc.user
%patch60 -p0
popd
# I hate spaces in paths with patch! # I hate spaces in paths with patch!
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
%patch0 -p0 %patch0 -p0
@ -640,11 +653,23 @@ popd
# fi # fi
#done #done
%build %build
env env
ORIGCLASSPATH=$CLASSPATH ORIGCLASSPATH=$CLASSPATH
# nasty hack to get these arches suppport
%ifarch ppc4 s390 s390x
for f in $(find -name \*x86_64\*); do
mv $f $(echo $f | sed "s/x86_64/%{_arch}/")
done
for f in $(find -name \*x86_64\*); do
mv $f $(echo $f | sed "s/x86_64/%{_arch}/")
done
find -type f -exec sed --in-place "s/x86_64/%{_arch}/g" "{}" \;
%endif
exit 1
# Bootstrapping is 3 parts: # Bootstrapping is 3 parts:
# 1. Build ecj with gcj -C -- only necessary until gcjx/ecj lands in gcc # 1. Build ecj with gcj -C -- only necessary until gcjx/ecj lands in gcc
# 2. Build ecj with gcj-built ecj ("javac") # 2. Build ecj with gcj-built ecj ("javac")