Update to aarch64-shenandoah-jdk8u232-b01.
Switch to EA mode. Drop JDK-8210761/RH1632174 as now upstream. Drop JDK-8223219 as now upstream. JDK-8226870 removed clhsdb and hdsdb from the JRE bin directory, so we should do likewise. Add alternatives support for these two new SDK binaries.
This commit is contained in:
parent
b66e592e09
commit
517cf68f1a
1
.gitignore
vendored
1
.gitignore
vendored
@ -148,3 +148,4 @@
|
|||||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b08.tar.xz
|
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b08.tar.xz
|
||||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b09.tar.xz
|
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b09.tar.xz
|
||||||
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b10.tar.xz
|
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b10.tar.xz
|
||||||
|
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u232-b01.tar.xz
|
||||||
|
@ -218,7 +218,7 @@
|
|||||||
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
|
# note, following three variables are sedded from update_sources if used correctly. Hardcode them rather there.
|
||||||
%global shenandoah_project aarch64-port
|
%global shenandoah_project aarch64-port
|
||||||
%global shenandoah_repo jdk8u-shenandoah
|
%global shenandoah_repo jdk8u-shenandoah
|
||||||
%global shenandoah_revision aarch64-shenandoah-jdk8u222-b10
|
%global shenandoah_revision aarch64-shenandoah-jdk8u232-b01
|
||||||
# Define old aarch64/jdk8u tree variables for compatibility
|
# Define old aarch64/jdk8u tree variables for compatibility
|
||||||
%global project %{shenandoah_project}
|
%global project %{shenandoah_project}
|
||||||
%global repo %{shenandoah_repo}
|
%global repo %{shenandoah_repo}
|
||||||
@ -234,12 +234,12 @@
|
|||||||
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
||||||
# eg jdk8u60-b27 -> b27
|
# eg jdk8u60-b27 -> b27
|
||||||
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
||||||
%global rpmrelease 3
|
%global rpmrelease 0
|
||||||
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
|
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
|
||||||
# Release will be (where N is usually a number starting at 1):
|
# Release will be (where N is usually a number starting at 1):
|
||||||
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
||||||
# - N%%{?extraver}{?dist} for GA releases
|
# - N%%{?extraver}{?dist} for GA releases
|
||||||
%global is_ga 1
|
%global is_ga 0
|
||||||
%if %{is_ga}
|
%if %{is_ga}
|
||||||
%global milestone fcs
|
%global milestone fcs
|
||||||
%global milestone_version %{nil}
|
%global milestone_version %{nil}
|
||||||
@ -410,7 +410,9 @@ alternatives \\
|
|||||||
--install %{_bindir}/javac javac %{sdkbindir -- %{?1}}/javac $PRIORITY --family %{name}.%{_arch} \\
|
--install %{_bindir}/javac javac %{sdkbindir -- %{?1}}/javac $PRIORITY --family %{name}.%{_arch} \\
|
||||||
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir -- %{?1}} \\
|
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir -- %{?1}} \\
|
||||||
--slave %{_bindir}/appletviewer appletviewer %{sdkbindir -- %{?1}}/appletviewer \\
|
--slave %{_bindir}/appletviewer appletviewer %{sdkbindir -- %{?1}}/appletviewer \\
|
||||||
|
--slave %{_bindir}/clhsdb clhsdb %{sdkbindir -- %{?1}}/clhsdb \\
|
||||||
--slave %{_bindir}/extcheck extcheck %{sdkbindir -- %{?1}}/extcheck \\
|
--slave %{_bindir}/extcheck extcheck %{sdkbindir -- %{?1}}/extcheck \\
|
||||||
|
--slave %{_bindir}/hsdb hsdb %{sdkbindir -- %{?1}}/hsdb \\
|
||||||
--slave %{_bindir}/idlj idlj %{sdkbindir -- %{?1}}/idlj \\
|
--slave %{_bindir}/idlj idlj %{sdkbindir -- %{?1}}/idlj \\
|
||||||
--slave %{_bindir}/jar jar %{sdkbindir -- %{?1}}/jar \\
|
--slave %{_bindir}/jar jar %{sdkbindir -- %{?1}}/jar \\
|
||||||
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
|
--slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \\
|
||||||
@ -589,8 +591,6 @@ exit 0
|
|||||||
%dir %{_jvmdir}/%{jredir -- %{?1}}
|
%dir %{_jvmdir}/%{jredir -- %{?1}}
|
||||||
%dir %{_jvmdir}/%{jredir -- %{?1}}/bin
|
%dir %{_jvmdir}/%{jredir -- %{?1}}/bin
|
||||||
%dir %{_jvmdir}/%{jredir -- %{?1}}/lib
|
%dir %{_jvmdir}/%{jredir -- %{?1}}/lib
|
||||||
%{_jvmdir}/%{jredir -- %{?1}}/bin/clhsdb
|
|
||||||
%{_jvmdir}/%{jredir -- %{?1}}/bin/hsdb
|
|
||||||
%{_jvmdir}/%{jredir -- %{?1}}/bin/java
|
%{_jvmdir}/%{jredir -- %{?1}}/bin/java
|
||||||
%{_jvmdir}/%{jredir -- %{?1}}/bin/jjs
|
%{_jvmdir}/%{jredir -- %{?1}}/bin/jjs
|
||||||
%{_jvmdir}/%{jredir -- %{?1}}/bin/keytool
|
%{_jvmdir}/%{jredir -- %{?1}}/bin/keytool
|
||||||
@ -1172,12 +1172,6 @@ Patch102: jdk8203030-zero_s390_31_bit_size_t_type_conflicts_in_shared_code.patch
|
|||||||
Patch202: jdk8035341-allow_using_system_installed_libpng.patch
|
Patch202: jdk8035341-allow_using_system_installed_libpng.patch
|
||||||
# 8042159: Allow using a system-installed lcms2
|
# 8042159: Allow using a system-installed lcms2
|
||||||
Patch203: jdk8042159-allow_using_system_installed_lcms2.patch
|
Patch203: jdk8042159-allow_using_system_installed_lcms2.patch
|
||||||
# 8210761: libjsig is being compiled without optimization
|
|
||||||
Patch620: jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
|
|
||||||
# JDK-8223219: Backport of JDK-8199552 to OpenJDK 8 leads to duplicate -fstack-protector flags,
|
|
||||||
# overriding --with-extra-cflags
|
|
||||||
Patch626: jdk8223219-fstack-protector-root.patch
|
|
||||||
Patch627: jdk8223219-fstack-protector-hotspot.patch
|
|
||||||
|
|
||||||
#############################################
|
#############################################
|
||||||
#
|
#
|
||||||
@ -1549,9 +1543,6 @@ sh %{SOURCE12}
|
|||||||
%patch574
|
%patch574
|
||||||
%patch575
|
%patch575
|
||||||
%patch577
|
%patch577
|
||||||
%patch620
|
|
||||||
%patch626
|
|
||||||
%patch627
|
|
||||||
%patch110
|
%patch110
|
||||||
|
|
||||||
# RPM-only fixes
|
# RPM-only fixes
|
||||||
@ -2196,6 +2187,14 @@ require "copy_jdk_configs.lua"
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Sep 27 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.232.b01-0.0.ea
|
||||||
|
- Update to aarch64-shenandoah-jdk8u232-b01.
|
||||||
|
- Switch to EA mode.
|
||||||
|
- Drop JDK-8210761/RH1632174 as now upstream.
|
||||||
|
- Drop JDK-8223219 as now upstream.
|
||||||
|
- JDK-8226870 removed clhsdb and hdsdb from the JRE bin directory, so we should do likewise.
|
||||||
|
- Add alternatives support for these two new SDK binaries.
|
||||||
|
|
||||||
* Thu Aug 15 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.222.b10-3
|
* Thu Aug 15 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.222.b10-3
|
||||||
- Switch to in-tree SunEC code, dropping NSS runtime dependencies and patches to link against it.
|
- Switch to in-tree SunEC code, dropping NSS runtime dependencies and patches to link against it.
|
||||||
|
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
# HG changeset patch
|
|
||||||
# User sgehwolf
|
|
||||||
# Date 1537541916 -7200
|
|
||||||
# Fri Sep 21 16:58:36 2018 +0200
|
|
||||||
# Node ID 4010c90156d1bfeaf988dbfeb01520f2e3a66ea8
|
|
||||||
# Parent 54afe70c50b6a6685763d00883e5173c0ba3a19d
|
|
||||||
8210761: libjsig is being compiled without optimization
|
|
||||||
Reviewed-by: erikj, ihse
|
|
||||||
|
|
||||||
diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make
|
|
||||||
--- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
|
|
||||||
+++ openjdk/hotspot/make/linux/makefiles/jsig.make
|
|
||||||
@@ -51,10 +51,15 @@
|
|
||||||
JSIG_DEBUG_CFLAGS = -g
|
|
||||||
endif
|
|
||||||
|
|
||||||
+# Optimize jsig lib at level -O3 unless it's a slowdebug build
|
|
||||||
+ifneq ($(DEBUG_LEVEL), slowdebug)
|
|
||||||
+ JSIG_OPT_FLAGS = $(OPT_CFLAGS)
|
|
||||||
+endif
|
|
||||||
+
|
|
||||||
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
|
|
||||||
@echo Making signal interposition lib...
|
|
||||||
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
|
|
||||||
- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
|
|
||||||
+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(JSIG_OPT_FLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
|
|
||||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
|
||||||
ifneq ($(STRIP_POLICY),no_strip)
|
|
||||||
$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
|
|
@ -1,35 +0,0 @@
|
|||||||
diff --git openjdk.orig/hotspot/make/bsd/makefiles/gcc.make openjdk/hotspot/make/bsd/makefiles/gcc.make
|
|
||||||
--- openjdk.orig/hotspot/make/bsd/makefiles/gcc.make
|
|
||||||
+++ openjdk/hotspot/make/bsd/makefiles/gcc.make
|
|
||||||
@@ -190,7 +190,7 @@
|
|
||||||
CFLAGS += -fno-exceptions
|
|
||||||
ifeq ($(USE_CLANG),)
|
|
||||||
CFLAGS += -pthread
|
|
||||||
- CFLAGS += -fcheck-new -fstack-protector
|
|
||||||
+ CFLAGS += -fcheck-new
|
|
||||||
# version 4 and above support fvisibility=hidden (matches jni_x86.h file)
|
|
||||||
# except 4.1.2 gives pointless warnings that can't be disabled (afaik)
|
|
||||||
ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
|
|
||||||
diff --git openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make
|
|
||||||
--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make
|
|
||||||
+++ openjdk/hotspot/make/linux/makefiles/gcc.make
|
|
||||||
@@ -150,7 +150,7 @@
|
|
||||||
CFLAGS += -fno-exceptions
|
|
||||||
CFLAGS += -D_REENTRANT
|
|
||||||
ifeq ($(USE_CLANG),)
|
|
||||||
- CFLAGS += -fcheck-new -fstack-protector
|
|
||||||
+ CFLAGS += -fcheck-new
|
|
||||||
# version 4 and above support fvisibility=hidden (matches jni_x86.h file)
|
|
||||||
# except 4.1.2 gives pointless warnings that can't be disabled (afaik)
|
|
||||||
ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
|
|
||||||
diff --git openjdk.orig/hotspot/make/solaris/makefiles/gcc.make openjdk/hotspot/make/solaris/makefiles/gcc.make
|
|
||||||
--- openjdk.orig/hotspot/make/solaris/makefiles/gcc.make
|
|
||||||
+++ openjdk/hotspot/make/solaris/makefiles/gcc.make
|
|
||||||
@@ -75,7 +75,6 @@
|
|
||||||
CFLAGS += -fno-exceptions
|
|
||||||
CFLAGS += -D_REENTRANT
|
|
||||||
CFLAGS += -fcheck-new
|
|
||||||
-CFLAGS += -fstack-protector
|
|
||||||
|
|
||||||
ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
|||||||
diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4
|
|
||||||
--- openjdk.orig/common/autoconf/flags.m4
|
|
||||||
+++ openjdk/common/autoconf/flags.m4
|
|
||||||
@@ -388,16 +388,8 @@
|
|
||||||
CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
|
|
||||||
CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
|
|
||||||
elif test "x$TOOLCHAIN_TYPE" = xgcc; then
|
|
||||||
- case $OPENJDK_TARGET_CPU_ARCH in
|
|
||||||
- x86 )
|
|
||||||
- LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
|
|
||||||
- LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
|
|
||||||
- ;;
|
|
||||||
- x86_64 )
|
|
||||||
- LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
|
|
||||||
- LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
+ LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
|
|
||||||
+ LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
|
|
||||||
if test "x$OPENJDK_TARGET_OS" != xmacosx; then
|
|
||||||
LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
|
|
||||||
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
|
|
||||||
@@ -464,10 +456,6 @@
|
|
||||||
ppc )
|
|
||||||
# on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
|
|
||||||
;;
|
|
||||||
- x86 )
|
|
||||||
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector"
|
|
||||||
- CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector"
|
|
||||||
- ;;
|
|
||||||
* )
|
|
||||||
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer"
|
|
||||||
CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
|
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e
|
SHA512 (tapsets-icedtea-3.11.0.tar.xz) = f98420b2f9d7a0fc0af3a7e6a817c4330169db9378d9c38db56b0dd8281a3f1ff7747b4da0c66194695ca85a470b7963902d863d301e5e290dbfe11f6b6f2b5e
|
||||||
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u222-b10.tar.xz) = 8e8379260a0f896c41b79e41e51609f3363f734b47cd412d20a4fe18079f73cdeefefdfa62b22f83743d289f8f622201f6650343ee6741163c57d1c5797dcc58
|
SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u232-b01.tar.xz) = 9e2e9e46ac40748574c3b7a19fac9b7b5616fe63bd4832421c54c2739da2ec2fc4d0cd284c90917286ce76a8055b3f8b21621c7c8aff0b5220ad617087b30245
|
||||||
|
Loading…
Reference in New Issue
Block a user