Don't do native ecj ... now I remember why I stopped doing it.
This commit is contained in:
parent
78668a96d2
commit
fa0c283f16
38
eclipse.spec
38
eclipse.spec
@ -663,10 +663,6 @@ tar -C $RPM_BUILD_ROOT%{_datadir} -zxf \
|
||||
result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
|
||||
|
||||
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||
%if %{native_ecj}
|
||||
# extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.2.jar
|
||||
unzip -d plugins plugins/org.eclipse.jdt.core_3.1.2.jar jdtCompilerAdapter.jar
|
||||
%endif
|
||||
|
||||
# Extract .so files
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
|
||||
@ -926,21 +922,23 @@ ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclip
|
||||
%if %{gcj_support}
|
||||
aot-compile-rpm
|
||||
|
||||
%if %{native_ecj}
|
||||
# Build and install ecj binary
|
||||
pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
|
||||
gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
|
||||
-Wl,-R,%{_libdir}/gcj/%{name} \
|
||||
org.eclipse.jdt.core_3.1.2.jar.so jdtCompilerAdapter.jar.so -o \
|
||||
$RPM_BUILD_ROOT%{_bindir}/ecj
|
||||
popd
|
||||
chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj
|
||||
%else
|
||||
# FIXME: due to aot-compile-rpm smarts, the required resource bundles aren't
|
||||
# being compiled so this truly native ecj binary isn't possible
|
||||
#%if %{native_ecj}
|
||||
# # Build and install ecj binary
|
||||
# pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
|
||||
# gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \
|
||||
# -Wl,-R,%{_libdir}/gcj/%{name} \
|
||||
# org.eclipse.jdt.core_3.1.2.jar.so -o \
|
||||
# $RPM_BUILD_ROOT%{_bindir}/ecj
|
||||
# popd
|
||||
# chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj
|
||||
#%else
|
||||
# Install /usr/bin/ecj script
|
||||
sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE20} > ecj
|
||||
install -m755 ecj $RPM_BUILD_ROOT%{_bindir}
|
||||
rm ecj
|
||||
%endif
|
||||
#%endif
|
||||
|
||||
%endif
|
||||
|
||||
@ -1068,19 +1066,12 @@ fi
|
||||
%dir %{_datadir}/%{name}/features
|
||||
%dir %{_datadir}/%{name}/configuration
|
||||
%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.*
|
||||
%if %{native_ecj}
|
||||
%{_datadir}/%{name}/plugins/jdtCompilerAdapter.jar
|
||||
%endif
|
||||
%{_datadir}/java/eclipse-ecj.jar
|
||||
%if %{gcj_support}
|
||||
# Native bits
|
||||
%dir %{_libdir}/gcj/%{name}
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.so
|
||||
%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.db
|
||||
%if %{native_ecj}
|
||||
%{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.so
|
||||
%{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.db
|
||||
%endif
|
||||
%{_bindir}/ecj
|
||||
%endif
|
||||
|
||||
@ -1314,9 +1305,6 @@ fi
|
||||
%changelog
|
||||
* Fri Mar 03 2006 Andrew Overholt <overholt@redhat.com> 3.1.2-1jpp_12fc
|
||||
- Only build with a native ecj on x86{,_64}
|
||||
- Make /usr/bin/ecj native again as it's slow as a script with gij and
|
||||
the chances of a someone using a proprietary JDK and not setting their
|
||||
javac alternative are slim.
|
||||
|
||||
* Tue Feb 28 2006 Andrew Overholt <overholt@redhat.com> 3.1.2-1jpp_12fc
|
||||
- Update to tomcat 5.5 (e.o#98371).
|
||||
|
Loading…
Reference in New Issue
Block a user