[packages/openjdk11] add fixes from openjdk9
atler
atler at pld-linux.org
Tue Sep 1 13:52:32 CEST 2020
commit 391a98378dbc1a771eaa8d04653232325388d04b
Author: Jan Palus <atler at pld-linux.org>
Date: Mon Aug 31 23:21:40 2020 +0200
add fixes from openjdk9
- disable full docs
- jhsdb built only with serviceability agent (exclude from zero)
- classlist generated only for server or client vm
openjdk11.spec | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/openjdk11.spec b/openjdk11.spec
index d1c0b34..8b4d731 100644
--- a/openjdk11.spec
+++ b/openjdk11.spec
@@ -11,6 +11,10 @@
%define with_aot 1
%endif
+%ifarch x32
+%define with_zero 1
+%endif
+
# class data version seen with file(1) that this jvm is able to load
%define _classdataversion 55.0
@@ -341,14 +345,13 @@ chmod a+x configure
# disable-debug-symbols so openjdk debuginfo handling won't conflict with ours
%configure \
-%ifarch x32
- --with-jvm-variants=zero \
-%endif
+ %{?with_zero:--with-jvm-variants=zero} \
--with-boot-jdk="%{java_home}" \
--with-extra-cflags="%{rpmcppflags} %{rpmcflags} -fcommon -fno-tree-dse" \
--with-extra-cxxflags="%{rpmcppflags} %{rpmcxxflags} -fcommon -fno-tree-dse" \
--with-extra-ldflags="%{rpmldflags}" \
--with-native-debug-symbols=none \
+ --disable-full-docs \
--disable-javac-server \
--disable-hotspot-gtest \
--disable-warnings-as-errors \
@@ -449,7 +452,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/jdb
%attr(755,root,root) %{_bindir}/jdeprscan
%attr(755,root,root) %{_bindir}/jdeps
-%attr(755,root,root) %{_bindir}/jhsdb
+%{!?with_zero:%attr(755,root,root) %{_bindir}/jhsdb}
%attr(755,root,root) %{_bindir}/jimage
%attr(755,root,root) %{_bindir}/jinfo
%attr(755,root,root) %{_bindir}/jlink
@@ -511,7 +514,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{dstdir}/bin/jdb
%attr(755,root,root) %{dstdir}/bin/jdeprscan
%attr(755,root,root) %{dstdir}/bin/jdeps
-%attr(755,root,root) %{dstdir}/bin/jhsdb
+%{!?with_zero:%attr(755,root,root) %{dstdir}/bin/jhsdb}
%attr(755,root,root) %{dstdir}/bin/jimage
%attr(755,root,root) %{dstdir}/bin/jinfo
%attr(755,root,root) %{dstdir}/bin/jlink
@@ -584,7 +587,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{dstdir}/lib/server
%attr(755,root,root) %{dstdir}/lib/server/*.so
%{dstdir}/lib/server/Xusage.txt
-%{dstdir}/lib/classlist
+%{!?with_zero:%{dstdir}/lib/classlist}
%{dstdir}/lib/jrt-fs.jar
%{dstdir}/lib/jvm.cfg
%attr(755,root,root) %{dstdir}/lib/libattach.so
@@ -614,9 +617,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{dstdir}/lib/libmlib_image.so
%attr(755,root,root) %{dstdir}/lib/libnet.so
%attr(755,root,root) %{dstdir}/lib/libnio.so
-%ifnarch x32
-%attr(755,root,root) %{dstdir}/lib/libsaproc.so
-%endif
+%{!?with_zero:%attr(755,root,root) %{dstdir}/lib/libsaproc.so}
%{?with_sunec:%attr(755,root,root) %{dstdir}/lib/libsunec.so}
%attr(755,root,root) %{dstdir}/lib/libunpack.so
%attr(755,root,root) %{dstdir}/lib/libverify.so
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openjdk11.git/commitdiff/391a98378dbc1a771eaa8d04653232325388d04b
More information about the pld-cvs-commit
mailing list