Hello community,
here is the log from the commit of package java-1_8_0-openjdk for
openSUSE:Factory checked in at 2017-09-21 12:30:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_8_0-openjdk"
Thu Sep 21 12:30:06 2017 rev:51 rq:526923 version:1.8.0.144
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes
2017-08-29 11:38:50.548595540 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk.changes
2017-09-21 12:30:13.010344784 +0200
@@ -1,0 +2,19 @@
+Sat Sep 16 07:29:20 UTC 2017 - [email protected]
+
+- Make the requirements for mozilla-nss requires_ge instead of
+ requires_eq
+
+-------------------------------------------------------------------
+Fri Sep 15 15:55:30 UTC 2017 - [email protected]
+
+- Don't require java-bootstrap-devel, build with the non-bootstrap
+ java.
+
+-------------------------------------------------------------------
+Thu Aug 31 14:31:46 UTC 2017 - [email protected]
+
+- Added patch:
+ * zero-atomic_copy64.patch
+ - Fix wrong assembly for ppc and (maybe for) s390
+
+-------------------------------------------------------------------
New:
----
zero-atomic_copy64.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_8_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.wtS9LM/_old 2017-09-21 12:30:15.517991882 +0200
+++ /var/tmp/diff_new_pack.wtS9LM/_new 2017-09-21 12:30:15.521991319 +0200
@@ -49,15 +49,6 @@
%global cacerts %{_jvmdir}/%{jredir}/lib/security/cacerts
# real file made by update-ca-certificates
%global javacacerts %{_var}/lib/ca-certificates/java-cacerts
-# turn zero on non jit arches by default
-%ifarch s390
-%global _with_bootstrap 0
-%else
-%bcond_without bootstrap
-%endif
-%ifnarch %{jit_arches}
-%global _with_zero 1
-%endif
%if 0%{?suse_version} >= 1140
%global with_pulseaudio 1
%else
@@ -123,8 +114,7 @@
%endif
%ifnarch %{jit_arches}
%global archinstall %{_arch}
-%endif
-%ifnarch %{jit_arches}
+# turn zero on non jit arches by default
%global _with_zero 1
%endif
# bnc#542545
@@ -143,6 +133,7 @@
%else
%global with_sunec 0
%endif
+%bcond_without bootstrap
%bcond_with zero
# Turn on/off some features depending on openSUSE version
%if 0%{?suse_version} >= 1130
@@ -195,6 +186,7 @@
Patch12: adlc-parser.patch
# Avoid triggering inactivity timeout while generating javadoc in zero VM
Patch14: zero-javadoc-verbose.patch
+Patch15: zero-atomic_copy64.patch
#
# OpenJDK specific patches
#
@@ -260,7 +252,8 @@
Provides: jre1.7.x
Provides: jre1.8.x
%if %{with bootstrap}
-BuildRequires: java-bootstrap-devel >= 1.7.0
+BuildRequires: java-devel >= 1.7
+BuildConflicts: java-devel >= 1.8
%else
BuildRequires: java-1_8_0-openjdk-devel
%endif
@@ -347,7 +340,7 @@
# The SunEC built against system NSS uses private APIs that
# change from time to time. Require thus the version we built
# against.
-%requires_eq mozilla-nss
+%requires_ge mozilla-nss
%else
Requires: mozilla-nss
%endif
@@ -503,6 +496,9 @@
%ifnarch %{arm} %{aarch64}
--with-parallel-jobs="${NUM_PROC}" \
%endif
+%ifarch s390
+ --with-boot-jdk-jvmargs="-Xms256M -Xmx768M" \
+%endif
--with-pkgversion="suse-%{release}-%{_arch}" \
--with-jdk-home="%{_sysconfdir}/alternatives/java_sdk" \
%if %{with_systemtap}
@@ -556,6 +552,7 @@
%if %{with zero}
patch -p0 -i %{PATCH14}
+patch -p0 -i %{PATCH15}
%endif
%ifarch ppc ppc64 ppc64le
@@ -1059,7 +1056,11 @@
%post accessibility
# create links to java-atk-wrapper
if [ ! -e %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so ]; then
+ if [ -e %{_libdir}/java-atk-wrapper/libatk-wrapper.so ]; then
+ ln -sf %{_libdir}/java-atk-wrapper/libatk-wrapper.so
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so
+ else
ln -sf %{_libdir}/java-atk-wrapper/libatk-wrapper.so.0
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so
+ fi
fi
if [ ! -e %{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar ]; then
ln -sf %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar
%{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.wtS9LM/_old 2017-09-21 12:30:15.573984002 +0200
+++ /var/tmp/diff_new_pack.wtS9LM/_new 2017-09-21 12:30:15.573984002 +0200
@@ -1,7 +1,7 @@
<constraints>
<hardware>
<physicalmemory>
- <size unit="M">3072</size>
+ <size unit="M">4096</size>
</physicalmemory>
<disk>
<size unit="G">20</size>
++++++ zero-atomic_copy64.patch ++++++
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2017-08-31
16:35:40.546293657 +0200
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2017-08-31
16:39:53.186297970 +0200
@@ -36,18 +36,19 @@
// Atomically copy 64 bits of data
static void atomic_copy64(volatile void *src, volatile void *dst) {
-#if defined(PPC32)
+#if defined(PPC32) && !defined(__NO_FPRS__)
double tmp;
- asm volatile ("lfd %0, 0(%1)\n"
- "stfd %0, 0(%2)\n"
- : "=f"(tmp)
- : "b"(src), "b"(dst));
+ asm volatile ("lfd %0, %2\n"
+ "stfd %0, %1\n"
+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
+ : "Q"(*(volatile double*)src));
#elif defined(S390) && !defined(_LP64)
double tmp;
asm volatile ("ld %0, 0(%1)\n"
"std %0, 0(%2)\n"
- : "=r"(tmp)
- : "a"(src), "a"(dst));
+ : "=&r"(tmp)
+ : "a"(src), "a"(dst)
+ : "memory");
#else
*(jlong *) dst = *(jlong *) src;
#endif
