commit 2997862174b9afd224f5871e0dcab6b552f3d5c1
Author: Jacek Konieczny <[email protected]>
Date: Fri Jul 18 11:02:47 2014 +0200
Disable shark for i486 again
It won't build with our current LLVM. Back to interpreted JVM on i486.
:-(
icedtea7.spec | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/icedtea7.spec b/icedtea7.spec
index 62ac370..96869b0 100644
--- a/icedtea7.spec
+++ b/icedtea7.spec
@@ -439,9 +439,6 @@ chmod a+x build-bin/ant
--with-abs-install-dir=%{dstdir} \
%{?with_bootstrap:--disable-bootstrap} \
--%{!?with_nss:dis}%{?with_nss:en}able-nss \
-%ifarch i486
- --enable-shark \
-%endif
--with-rhino=%{_javadir}/js.jar
%{__make} extract \
@@ -662,7 +659,9 @@ rm -rf $RPM_BUILD_ROOT
%{dstdir}/lib/jconsole.jar
%attr(755,root,root) %{dstdir}/lib/jexec
%{dstdir}/lib/orb.idl
+%ifnarch i486
%{dstdir}/lib/sa-jdi.jar
+%endif
%{dstdir}/lib/tools.jar
%dir %{dstdir}/lib/%{jre_arch}
%dir %{dstdir}/lib/%{jre_arch}/jli
@@ -734,7 +733,7 @@ rm -rf $RPM_BUILD_ROOT
%{jredir}/lib/cmm
%{jredir}/lib/ext
%dir %{jredir}/lib/%{jre_arch}
-%ifnarch %{x8664}
+%ifnarch %{x8664} i486
%dir %{jredir}/lib/%{jre_arch}/client
%{jredir}/lib/%{jre_arch}/client/Xusage.txt
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/client/*.so
@@ -745,7 +744,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/jli/*.so
%dir %{jredir}/lib/%{jre_arch}/server
%{jredir}/lib/%{jre_arch}/server/Xusage.txt
+%ifnarch i486
%{jredir}/lib/%{jre_arch}/server/classes.jsa
+%endif
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/server/*.so
%{jredir}/lib/%{jre_arch}/jvm.cfg
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libattach.so
@@ -773,7 +774,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libnet.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libnio.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libnpt.so
+%ifnarch i486
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libsaproc.so
+%endif
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libsctp.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libunpack.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libverify.so
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/2997862174b9afd224f5871e0dcab6b552f3d5c1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
