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