11
0

Accepting request 526923 from Java:Factory

Build against a plain java-devel provider instead of java-bootstrap-devel

OBS-URL: https://build.opensuse.org/request/show/526923
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openjdk?expand=0&rev=51
This commit is contained in:
2017-09-21 10:30:06 +00:00
committed by Git OBS Bridge
4 changed files with 64 additions and 15 deletions

View File

@@ -1,7 +1,7 @@
<constraints>
<hardware>
<physicalmemory>
<size unit="M">3072</size>
<size unit="M">4096</size>
</physicalmemory>
<disk>
<size unit="G">20</size>

View File

@@ -1,3 +1,22 @@
-------------------------------------------------------------------
Sat Sep 16 07:29:20 UTC 2017 - fstrba@suse.com
- Make the requirements for mozilla-nss requires_ge instead of
requires_eq
-------------------------------------------------------------------
Fri Sep 15 15:55:30 UTC 2017 - fstrba@suse.com
- Don't require java-bootstrap-devel, build with the non-bootstrap
java.
-------------------------------------------------------------------
Thu Aug 31 14:31:46 UTC 2017 - fstrba@suse.com
- Added patch:
* zero-atomic_copy64.patch
- Fix wrong assembly for ppc and (maybe for) s390
-------------------------------------------------------------------
Wed Aug 23 09:54:09 UTC 2017 - fstrba@suse.com

View File

@@ -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 @@ Patch3: java-atk-wrapper-security.patch
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.6.x
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 @@ Provides: jsse = %{version}
# 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
@@ -502,6 +495,9 @@ sh autogen.sh
--with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
%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" \
@@ -556,6 +552,7 @@ patch -p0 -i %{PATCH12}
%if %{with zero}
patch -p0 -i %{PATCH14}
patch -p0 -i %{PATCH15}
%endif
%ifarch ppc ppc64 ppc64le
@@ -1059,7 +1056,11 @@ fi
%post accessibility
# create links to java-atk-wrapper
if [ ! -e %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so ]; then
ln -sf %{_libdir}/java-atk-wrapper/libatk-wrapper.so.0 %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so
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

29
zero-atomic_copy64.patch Normal file
View File

@@ -0,0 +1,29 @@
--- 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