From 8af4ea38e8cea36024eec0ac4b473bae0b7cddbf Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Jan 25 2005 16:52:20 +0000 Subject: - use native ecj instead of interpreted --- diff --git a/eclipse.spec b/eclipse.spec index ea7fc87..fe6d234 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -52,7 +52,7 @@ Epoch: 1 Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro}_fc -Release: 6 +Release: 7 License: CPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -305,7 +305,10 @@ rm -rf plugins/org.eclipse.jdt.core mv plugins/org.eclipse.jdt.core.original plugins/org.eclipse.jdt.core # Now use this built ecj for the rest of the build -export CLASSPATH=`pwd`/ecj-bootstrap.jar:$CLASSPATH +#export CLASSPATH=`pwd`/ecj-bootstrap.jar:$CLASSPATH +gcj4 -fPIC -fjni -findirect-dispatch -shared -o ecj-bootstrap.jar.so \ + ecj-bootstrap.jar +export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH # -------- ecj build -------- pushd plugins/org.eclipse.swt.tools @@ -417,7 +420,8 @@ popd %install rm -rf $RPM_BUILD_ROOT -export CLASSPATH=`pwd`/ecj-bootstrap.jar:$CLASSPATH +export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH +#export CLASSPATH=`pwd`/ecj-bootstrap.jar:$CLASSPATH %{ant} \ -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \ -Dbuild.compiler=modern \ @@ -677,6 +681,7 @@ rm -rf $RPM_BUILD_ROOT %attr(0664,root,root) %{_libdir}/%{name}/swt-mozilla.jar.so %attr(0664,root,root) %{_libdir}/%{name}/swt-pi.jar.so %attr(0664,root,root) %{_libdir}/%{name}/swt.jar.so +%attr(0644,root,root) %{_libdir}/%{name}/%{libname}-gtk2.jarswithnativelibs %files jdt -f %{name}-jdt.install %defattr(0644,root,root,0755) @@ -793,9 +798,10 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/%{name}/%{name}-platform.jarswithnativelibs %changelog -* Tue Jan 25 2005 Andrew Overholt 1:3.0.1_fc-6 +* Tue Jan 25 2005 Andrew Overholt 1:3.0.1_fc-7 - add missing jar-so combinations to lists - add libswt3-gtk2 jar-so combinations +- use native ecj instead of interpreted * Mon Jan 24 2005 Andrew Overholt 1:3.0.1_fc-5 - refine resources.jar.so workaround