Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2017-09-11 16:17:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk"
Mon Sep 11 16:17:15 2017 rev:89 rq:522909 version:1.7.0.151
Changes:
--------
---
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes
2017-09-04 12:25:10.833505998 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes
2017-09-11 16:17:16.679155862 +0200
@@ -1,0 +2,20 @@
+Sun Sep 10 14:15:14 UTC 2017 - [email protected]
+
+- Filter out -fstack-clash-protection: Since we build using GCC6,
+ this new flag in optflags is not understood.
+
+-------------------------------------------------------------------
+Thu Aug 31 14:31:46 UTC 2017 - [email protected]
+
+- Added patch:
+ * zero-atomic_copy64.patch
+ - Fix wrong assembly for ppc
+
+-------------------------------------------------------------------
+Mon Aug 28 09:02:33 UTC 2017 - [email protected]
+
+- Remove ecj requirement for a non-bootstrap build.
+- BuildIgnore also java-headless, in order to solve need of
+ java-1_8_0-openjdk-headless during the build ofjava-1_7_0-openjdk
+
+-------------------------------------------------------------------
java-1_7_0-openjdk.changes: same change
New:
----
zero-atomic_copy64.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.Ji360l/_old 2017-09-11 16:17:19.450766635 +0200
+++ /var/tmp/diff_new_pack.Ji360l/_new 2017-09-11 16:17:19.454766073 +0200
@@ -143,7 +143,6 @@
BuildRequires: java-1_5_0-gcj-compat-devel
Conflicts: java-1_7_0-openjdk
%else
-BuildRequires: ecj
BuildRequires: java-bootstrap >= 1.7.0
BuildRequires: java-bootstrap-devel >= 1.7.0
#!BuildIgnore: %{name}
@@ -151,6 +150,7 @@
#!BuildIgnore: %{name}-headless
#!BuildIgnore: java
#!BuildIgnore: java-devel
+#!BuildIgnore: java-headless
%endif
Name: java-1_7_0-openjdk-bootstrap
Version: %{javaver}.%{buildver}
@@ -218,6 +218,7 @@
# Avoid too much silence from javadoc
Patch1005: java-1_7_0-openjdk-javadoc-verbose.patch
Patch1006: java-1_7_0-openjdk-override.patch
+Patch1007: zero-atomic_copy64.patch
Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch
Patch10012: java-1_7_0-openjdk-libjvm-link.patch
BuildRequires: alsa-lib-devel
@@ -558,7 +559,7 @@
export CC=gcc-$(gcj -dumpversion)
%endif
-export CFLAGS=$(rpm -E '%{optflags}' | sed 's/-Wall\>//')
+export CFLAGS=$(rpm -E '%{optflags}' | sed -e 's/-Wall\>//' -e
's/-fstack-clash-protection//')
export CXXFLAGS=${CFLAGS}
%if %{with_sunec}
export NSS_SOFTOKN_CFLAGS="`pkg-config --cflags nss` -I`pwd`"
@@ -646,6 +647,7 @@
%if %{with zero}
patch -p0 -i %{PATCH1004}
patch -p1 -i %{PATCH1005}
+patch -p0 -i %{PATCH1007}
#XXX: there are many issues in hotspot 2.1, but I would say noone will fix them
# so ignore all Werror like troubles we can find
@@ -1113,7 +1115,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
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.Ji360l/_old 2017-09-11 16:17:19.486761580 +0200
+++ /var/tmp/diff_new_pack.Ji360l/_new 2017-09-11 16:17:19.490761018 +0200
@@ -143,7 +143,6 @@
BuildRequires: java-1_5_0-gcj-compat-devel
Conflicts: java-1_7_0-openjdk
%else
-BuildRequires: ecj
BuildRequires: java-bootstrap >= 1.7.0
BuildRequires: java-bootstrap-devel >= 1.7.0
#!BuildIgnore: %{name}
@@ -151,6 +150,7 @@
#!BuildIgnore: %{name}-headless
#!BuildIgnore: java
#!BuildIgnore: java-devel
+#!BuildIgnore: java-headless
%endif
Name: java-1_7_0-openjdk
Version: %{javaver}.%{buildver}
@@ -218,6 +218,7 @@
# Avoid too much silence from javadoc
Patch1005: java-1_7_0-openjdk-javadoc-verbose.patch
Patch1006: java-1_7_0-openjdk-override.patch
+Patch1007: zero-atomic_copy64.patch
Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch
Patch10012: java-1_7_0-openjdk-libjvm-link.patch
BuildRequires: alsa-lib-devel
@@ -558,7 +559,7 @@
export CC=gcc-$(gcj -dumpversion)
%endif
-export CFLAGS=$(rpm -E '%{optflags}' | sed 's/-Wall\>//')
+export CFLAGS=$(rpm -E '%{optflags}' | sed -e 's/-Wall\>//' -e
's/-fstack-clash-protection//')
export CXXFLAGS=${CFLAGS}
%if %{with_sunec}
export NSS_SOFTOKN_CFLAGS="`pkg-config --cflags nss` -I`pwd`"
@@ -646,6 +647,7 @@
%if %{with zero}
patch -p0 -i %{PATCH1004}
patch -p1 -i %{PATCH1005}
+patch -p0 -i %{PATCH1007}
#XXX: there are many issues in hotspot 2.1, but I would say noone will fix them
# so ignore all Werror like troubles we can find
@@ -1113,7 +1115,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
++++++ zero-atomic_copy64.patch ++++++
--- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2017-08-31
16:23:27.960760518 +0200
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2017-08-31
16:26:16.828634278 +0200
@@ -36,12 +36,12 @@
// 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"
