Compare commits
6 Commits
Author | SHA1 | Date |
---|---|---|
|
46300d1624 | |
|
e485f0600a | |
|
06546df9ee | |
|
41018aa951 | |
|
c9af040367 | |
|
b6045cfa96 |
|
@ -1,3 +1,4 @@
|
|||
/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
|
||||
/shenandoah-jdk11-b516c8c7a0a4.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11+22.tar.xz
|
||||
/shenandoah-jdk11-shenandoah-jdk-11+28.tar.xz
|
||||
|
|
|
@ -6,3 +6,4 @@ JDK11 is last LTS release of Java platform. It is bringing many cool improvement
|
|||
See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
|
||||
See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf
|
||||
|
||||
https://fedoraproject.org/wiki/Changes/java-11-openjdk-TechPreview
|
||||
|
|
|
@ -94,8 +94,13 @@ diff --git a/make/lib/Lib-jdk.crypto.ec.gmk b/make/lib/Lib-jdk.crypto.ec.gmk
|
|||
$(eval $(call SetupJdkLibrary, BUILD_LIBSUNEC, \
|
||||
NAME := sunec, \
|
||||
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
|
||||
@@ -58,6 +64,7 @@
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
|
||||
@@ -47,9 +52,11 @@
|
||||
CXXFLAGS := $(BUILD_LIBSUNEC_CXXFLAGS_JDKLIB), \
|
||||
DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough, \
|
||||
DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \
|
||||
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
|
||||
+ LDFLAGS := $(subst -Xlinker --as-needed,, \
|
||||
+ $(subst -Wl$(COMMA)--as-needed,, $(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK), \
|
||||
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
LIBS := $(LIBCXX), \
|
||||
+ LIBS_linux := -lc $(NSS_LIBS), \
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
diff -r 1ddf9a99e4ad src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp
|
||||
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp Wed Aug 22 21:50:12 2018 +0200
|
||||
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp Thu Sep 13 13:51:53 2018 +0100
|
||||
@@ -5745,11 +5745,13 @@
|
||||
}
|
||||
|
||||
if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin)) {
|
||||
- StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false);
|
||||
+ // disabled pending fix and retest of generated code
|
||||
+ // StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false);
|
||||
}
|
||||
|
||||
if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) {
|
||||
- StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true);
|
||||
+ // disabled pending fix and retest of generated code
|
||||
+ // StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true);
|
||||
}
|
||||
}
|
|
@ -196,7 +196,7 @@
|
|||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global minorver 0
|
||||
%global buildver 22
|
||||
%global buildver 28
|
||||
# priority must be 7 digits in total
|
||||
# setting to 1, so debug ones can have 0
|
||||
%global priority 00000%{minorver}1
|
||||
|
@ -349,7 +349,11 @@ alternatives \\
|
|||
%endif
|
||||
--slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\
|
||||
--slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\
|
||||
%ifarch %{jit_arches}
|
||||
%ifnarch s390x
|
||||
--slave %{_bindir}/jhsdb jhsdb %{sdkbindir -- %{?1}}/jhsdb \\
|
||||
%endif
|
||||
%endif
|
||||
--slave %{_bindir}/jar jar %{sdkbindir -- %{?1}}/jar \\
|
||||
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
|
||||
--slave %{_bindir}/javadoc javadoc %{sdkbindir -- %{?1}}/javadoc \\
|
||||
|
@ -499,7 +503,9 @@ exit 0
|
|||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/unpack200
|
||||
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
|
||||
%ifarch %{jit_arches}
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
|
||||
%endif
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jrt-fs.jar
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/modules
|
||||
|
@ -546,12 +552,9 @@ exit 0
|
|||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libunpack.so
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libzip.so
|
||||
# Zero does not have JFR
|
||||
%ifarch %{jit_arches}
|
||||
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
|
||||
%endif
|
||||
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
|
||||
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1*
|
||||
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
|
||||
|
@ -597,8 +600,6 @@ exit 0
|
|||
%config(noreplace) %{etcjavadir -- %{?1}}/conf/management/management.properties
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/conf/net.properties
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/conf/sound.properties
|
||||
# accessibility have package over user maintenance, so not config-noreplace
|
||||
%config %{etcjavadir -- %{?1}}/conf/accessibility.properties
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/conf
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/security
|
||||
}
|
||||
|
@ -704,7 +705,7 @@ OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release
|
|||
# for java-X-openjdk package's desktop binding
|
||||
Recommends: gtk3%{?_isa}
|
||||
|
||||
Provides: java-%{javaver}-%{origin} = %{epoch}:%{version}-%{release}
|
||||
Provides: java-%{javaver}-%{origin}%{?1} = %{epoch}:%{version}-%{release}
|
||||
|
||||
# Standard JPackage base provides
|
||||
Provides: jre = %{javaver}%{?1}
|
||||
|
@ -837,7 +838,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
|
|||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{newjavaver}.%{buildver}
|
||||
Release: 6%{?dist}
|
||||
Release: 5%{?dist}
|
||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||
# also included the epoch in their virtual provides. This created a
|
||||
|
@ -909,6 +910,10 @@ Patch3: libjpeg-turbo-1.4-compat.patch
|
|||
Patch4: RHBZ-1249083-system-crypto-policy-PR3183.patch
|
||||
# System NSS via SunEC Provider
|
||||
Patch5: RHBZ-1565658-system-nss-SunEC.patch
|
||||
# Temporarily disable dsin/dcos intrinsics on aarch64, falling
|
||||
# back to C code. Re-enable once JDK-8210461 is fixed and
|
||||
# available in jdk11u.
|
||||
Patch6: RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
|
@ -1179,6 +1184,7 @@ pushd %{top_level_dir_name}
|
|||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
|
||||
popd # openjdk
|
||||
|
||||
|
@ -1297,6 +1303,9 @@ bash ../configure \
|
|||
--with-extra-ldflags="%{ourldflags}" \
|
||||
--with-num-cores="$NUM_PROC" \
|
||||
--disable-javac-server \
|
||||
%ifarch x86_64
|
||||
--with-jvm-features=zgc \
|
||||
%endif
|
||||
--disable-warnings-as-errors
|
||||
|
||||
make \
|
||||
|
@ -1519,12 +1528,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/.java/.systemPrefs
|
|||
# copy samples next to demos; samples are mostly js files
|
||||
cp -r %{top_level_dir_name}/src/sample $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/
|
||||
|
||||
pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir -- $suffix}/conf/
|
||||
echo "#Config file to enable java-atk-wrapper" > accessibility.properties
|
||||
echo "" >> accessibility.properties
|
||||
echo "assistive_technologies=org.GNOME.Accessibility.AtkWrapper" >> accessibility.properties
|
||||
echo "" >> accessibility.properties
|
||||
popd
|
||||
|
||||
# moving config files to /etc
|
||||
mkdir -p $RPM_BUILD_ROOT/%{etcjavadir -- $suffix}
|
||||
|
@ -1732,6 +1735,33 @@ require "copy_jdk_configs.lua"
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Sep 13 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.28-5
|
||||
- Add patch, RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch,
|
||||
so as to disable dsin/dcos math intrinsics on aarch64. Work-around for
|
||||
JDK-8210461.
|
||||
|
||||
* Mon Sep 10 2018 Jiri Vanek <jvanek@redhat.com> - 1:11.0.ea.28-4
|
||||
- link to jhsdb followed its file to ifarch jit_arches ifnarch s390x
|
||||
|
||||
* Fri Sep 7 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.28-3
|
||||
- Enable ZGC on x86_64.
|
||||
|
||||
* Tue Sep 4 2018 Jiri Vanek <jvanek@redhat.com> - 1:11.0.ea.28-2
|
||||
- jfr/*jfc files listed for all arches
|
||||
- lib/classlist do not exists s390, ifarch-ed via jit_arches out
|
||||
|
||||
* Fri Aug 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.28-1
|
||||
- Update to latest upstream build jdk11+28, the first release
|
||||
candidate.
|
||||
|
||||
* Wed Aug 29 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.ea.22-8
|
||||
- Adjust system NSS patch, RHBZ-1565658-system-nss-SunEC.patch, so
|
||||
as to filter -Wl,--as-needed from linker flags. Fixes FTBFS issue.
|
||||
Resolves: RHBZ#1623437
|
||||
|
||||
* Thu Aug 23 2018 Jiri Vanek <jvanek@redhat.com> - 1:11.0.ea.22-6
|
||||
- dissabled accessibility, fixed provides for main package's debug variant
|
||||
|
||||
* Mon Jul 30 2018 Jiri Vanek <jvanek@redhat.com> - 1:11.0.ea.22-5
|
||||
- now buildrequires javapackages-filesystem as the issue with macros should be fixed
|
||||
|
||||
|
|
2
sources
2
sources
|
@ -1,2 +1,2 @@
|
|||
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
|
||||
SHA512 (shenandoah-jdk11-shenandoah-jdk-11+22.tar.xz) = 26b21be95d7302a4cf4afc63a0edc59ba3829303985654b5b6148a54f0bd6a36685463ccca86ed68f7498bfd8e7bec270e67210747e15b2d44105f4f00e48aa6
|
||||
SHA512 (shenandoah-jdk11-shenandoah-jdk-11+28.tar.xz) = 4ca6a69cb1b67dd6749861de5f49e50a43c9c7a6100d4b55c722960fec90bb280dc995be7d76e9b2d4519ce0d8fef54c25be8e9b33b80d6c6ec9130ef166e4ee
|
||||
|
|
|
@ -35,7 +35,7 @@ fi
|
|||
export PROJECT_NAME="shenandoah"
|
||||
export REPO_NAME="jdk11"
|
||||
# warning, clonning without shenadnaoh suffix, you will clone pure jdk - thus without shenandaoh GC
|
||||
export VERSION="shenandoah-jdk-11+22"
|
||||
export VERSION="shenandoah-jdk-11+28"
|
||||
export COMPRESSION=xz
|
||||
# unset tapsets overrides
|
||||
export OPENJDK_URL=""
|
||||
|
|
Loading…
Reference in New Issue