rpms/eclipse/devel eclipse.spec,1.162,1.163

[fedora-cvs-commits redhat com]

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31190

Modified Files:
	eclipse.spec 
Log Message:
* Tue Jul 05 2005 Andrew Overholt <overholt redhat com> 3.1.0_fc-4
- Add ecj_bootstrap patch from Gary Benson to bootstrap new architectures.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- eclipse.spec	5 Jul 2005 15:57:04 -0000	1.162
+++ eclipse.spec	5 Jul 2005 16:12:22 -0000	1.163
@@ -1,5 +1,11 @@
 Epoch:	1
 
+%ifarch %{ix86} x86_64 ppc
+%define ecj_bootstrap	0
+%else
+%define ecj_bootstrap	1
+%endif
+
 %define gcj_support 	1
 %define tomcatsharedir 	%{_datadir}/tomcat5
 %define tomcatlibdir 	%{_var}/lib/tomcat5
@@ -24,7 +30,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:        3
+Release:        4
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -103,25 +109,32 @@
 BuildArch:	noarch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+%if !%{ecj_bootstrap}
 BuildRequires:  ant
+%endif
 BuildRequires:  perl
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gcc-c++
+%ifnarch ppc64
 BuildRequires:  mozilla >= 37:1.7.8
 BuildRequires:  mozilla-devel >= 37:1.7.8
 BuildRequires:  mozilla-nspr-devel >= 37:1.7.8
+%endif
 BuildRequires:  xorg-x11-devel
 %if %{gcj_support}
 BuildRequires:	gcc-java >= 4.0.0-9
+%if !%{ecj_bootstrap}
 BuildRequires:	java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_24rh
+%endif
 BuildRequires:  dos2unix
 %else
 BuildRequires:	java-devel >= 1.4.2
 %endif
 
+%if !%{ecj_bootstrap}
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
 #BuildRequires: ant-apache-bsf ant-commons-net
 BuildRequires: ant-javamail ant-jdepend ant-jmf ant-junit ant-nodeps ant-swing ant-trax ant-jsch
@@ -132,6 +145,7 @@
 BuildRequires: lucene lucene-demo
 BuildRequires: regexp 
 BuildRequires: junit >= 3.8.1-3jpp
+%endif
 %if %{gcj_support}
 Requires(post,postun): java-1.4.2-gcj-compat
 %endif
@@ -157,6 +171,7 @@
 %description    ecj
 Eclipse compiler for Java.
 
+%if !%{ecj_bootstrap}
 %package        platform
 Summary:        Eclipse platform common files
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -280,6 +295,7 @@
 
 %description    rcp-devel
 Source for RCP for use within Eclipse.
+%endif
 
 %prep
 %setup -q -c
@@ -503,6 +519,14 @@
   export CLASSPATH=ecj-bootstrap.jar:$ORIGCLASSPATH
   #export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db"
 %endif
+%if %{ecj_bootstrap}
+  gcj -O1 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+    -o ecj-bootstrap.jar.so ecj-bootstrap.jar
+  gcj -g --main=org.eclipse.jdt.internal.compiler.batch.Main \
+    -Wl,-R,%{_libdir}/%{name} ecj-bootstrap.jar.so -o ecj
+%endif
+
+%if !%{ecj_bootstrap}
 ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
 
 %if %{gcj_support}
@@ -639,10 +663,21 @@
 #find $src_root -type d -a \( -name org.eclipse.swt -prune -o -name org -print0 \) | xargs -l -0 ./copyallsrc
 #./copyallsrc $src_root/org.eclipse.swt/Eclipse\ SWT/gtk/org
 #popd
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%if %{ecj_bootstrap}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
+install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
+install -m 644 ecj-bootstrap.jar $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar
+install -m 644 ecj-bootstrap.jar.so $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse-ecj.jar.so
+install -m 644 ecj $RPM_BUILD_ROOT%{_bindir}
+
+%else
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 tar -C $RPM_BUILD_ROOT%{_datadir} -zxf \
@@ -986,10 +1021,18 @@
     done;
 done
 %endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{ecj_bootstrap}
+%files ecj
+%{_datadir}/java/eclipse-ecj.jar
+%{_libdir}/%{name}/eclipse-ecj.jar.so
+%{_bindir}/ecj
+
+%else
 %if %{gcj_support}
 %post ecj
 %{_bindir}/rebuild-gcj-db %{_libdir}
@@ -1227,8 +1270,12 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source_3.*
 %{_datadir}/%{name}/features/org.eclipse.platform.source_3.*
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
+%endif
 
 %changelog
+* Tue Jul 05 2005 Andrew Overholt <overholt redhat com> 3.1.0_fc-4
+- Add ecj_bootstrap patch from Gary Benson to bootstrap new architectures.
+
 * Tue Jul 05 2005 Andrew Overholt <overholt redhat com> 3.1.0_fc-3
 - Bump release for FC4 update.