The package rpms/java-11-openjdk.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/java-11-openjdk.git/commit/?id=f99bf....
Change: -%ifarch x86_64
Thanks.
Full change: ============
commit 095654461fca0556ab283cae20174a26dd017c9d Author: Andrew Hughes gnu.andrew@redhat.com Date: Tue Sep 15 12:45:40 2020 +0000
Update to jdk-11.0.9+6 (EA)
Update tarball generation script to use PR3802, handling JDK-8233228 & JDK-8177334
Resolves: rhbz#1869017
diff --git a/.gitignore b/.gitignore index 5222b94..d6d271b 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ /jdk-updates-jdk11u-jdk-11.0.9+3-4curve.tar.xz /jdk-updates-jdk11u-jdk-11.0.9+4-4curve.tar.xz /jdk-updates-jdk11u-jdk-11.0.9+5-4curve.tar.xz +/jdk-updates-jdk11u-jdk-11.0.9+6-4curve.tar.xz diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh index a320ee5..8a842ce 100755 --- a/generate_source_tarball.sh +++ b/generate_source_tarball.sh @@ -4,7 +4,7 @@ # Example: # When used from local repo set REPO_ROOT pointing to file:// with your repo # If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL -# If you want to use a local copy of patch PR3751, set the path to it in the PR3751 variable +# If you want to use a local copy of patch PR3802, set the path to it in the PR3802 variable # # In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg: # PROJECT_NAME=jdk @@ -26,9 +26,9 @@ # level folder, name is created, based on parameter #
-if [ ! "x$PR3751" = "x" ] ; then - if [ ! -f "$PR3751" ] ; then - echo "You have specified PR3751 as $PR3751 but it does not exist. Exiting" +if [ ! "x$PR3802" = "x" ] ; then + if [ ! -f "$PR3802" ] ; then + echo "You have specified PR3802 as $PR3802 but it does not exist. Exiting" exit 1 fi fi @@ -48,7 +48,7 @@ if [ "x$1" = "xhelp" ] ; then echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)" echo "REPO_ROOT - the location of the Mercurial repository to archive (optional; defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME)" echo "TO_COMPRESS - what part of clone to pack (default is openjdk)" - echo "PR3751 - the path to the PR3751 patch to apply (optional; downloaded if unavailable)" + echo "PR3802 - the path to the PR3802 patch to apply (optional; downloaded if unavailable)" exit 1; fi
@@ -126,17 +126,17 @@ pushd "${FILE_NAME_ROOT}" rm -vf ${CRYPTO_PATH}/ecp_224.c
echo "Syncing EC list with NSS" - if [ "x$PR3751" = "x" ] ; then - # get pr3751.patch (from http://icedtea.classpath.org/hg/icedtea11) from most correct tag + if [ "x$PR3802" = "x" ] ; then + # get pr3802.patch (from http://icedtea.classpath.org/hg/icedtea11) from most correct tag # Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3751) - echo "PR3751 not found. Downloading..." - wget http://icedtea.classpath.org/hg/icedtea11/raw-file/tip/patches/pr3751.patch - echo "Applying ${PWD}/pr3751.patch" - patch -Np1 < pr3751.patch - rm pr3751.patch + echo "PR3802 not found. Downloading..." + wget http://icedtea.classpath.org/hg/icedtea11/raw-file/tip/patches/pr3802-4curve... + echo "Applying ${PWD}/pr3802.patch" + patch -Np1 < pr3802.patch + rm pr3802.patch else - echo "Applying ${PR3751}" - patch -Np1 < $PR3751 + echo "Applying ${PR3802}" + patch -Np1 < $PR3802 fi; find . -name '*.orig' -exec rm -vf '{}' ';' popd diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 82e4935..97b6a55 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -258,7 +258,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 5 +%global buildver 6 %global rpmrelease 0 #%%global tagsuffix "" # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit @@ -1962,6 +1962,11 @@ require "copy_jdk_configs.lua"
%changelog +* Tue Sep 15 2020 Andrew Hughes gnu.andrew@redhat.com - 1:11.0.9.6-0.0.ea +- Update to jdk-11.0.9+6 (EA) +- Update tarball generation script to use PR3802, handling JDK-8233228 & JDK-8177334 +- Resolves: rhbz#1869017 + * Tue Sep 08 2020 Andrew Hughes gnu.andrew@redhat.com - 1:11.0.9.5-0.0.ea - Update to jdk-11.0.9+5 (EA)
diff --git a/sources b/sources index e8f530a..a776d0a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 -SHA512 (jdk-updates-jdk11u-jdk-11.0.9+5-4curve.tar.xz) = e3a4f580a3e69724772cd2d5716cae3e714368761aedb8c23d85b25f125bea10c0980d1df3ba03095da72a55490b1b7e9236f72a0381819bcd8107e57f5fe542 +SHA512 (jdk-updates-jdk11u-jdk-11.0.9+6-4curve.tar.xz) = 8eab79248c68b931d2c9eee07e88fe78a1289c37bbb0a315545c1a7fad64886fb7e9c21941edef7f8b84b3633d8f17a9ec1edef3de307cee8fe17222a997834b
commit 3c64476242ef9b96eea7d6c0ad5d4261d6659779 Author: Andrew Hughes gnu.andrew@redhat.com Date: Tue Sep 15 02:49:14 2020 +0000
Update to jdk-11.0.9+5 (EA)
diff --git a/.gitignore b/.gitignore index cc55090..5222b94 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ /jdk-updates-jdk11u-jdk-11.0.9+2-4curve.tar.xz /jdk-updates-jdk11u-jdk-11.0.9+3-4curve.tar.xz /jdk-updates-jdk11u-jdk-11.0.9+4-4curve.tar.xz +/jdk-updates-jdk11u-jdk-11.0.9+5-4curve.tar.xz diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 72b14ba..82e4935 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -258,7 +258,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 4 +%global buildver 5 %global rpmrelease 0 #%%global tagsuffix "" # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit @@ -1962,6 +1962,9 @@ require "copy_jdk_configs.lua"
%changelog +* Tue Sep 08 2020 Andrew Hughes gnu.andrew@redhat.com - 1:11.0.9.5-0.0.ea +- Update to jdk-11.0.9+5 (EA) + * Thu Sep 03 2020 Andrew Hughes gnu.andrew@redhat.com - 1:11.0.9.4-0.0.ea - Update to jdk-11.0.9+4 (EA)
diff --git a/sources b/sources index 2163af2..e8f530a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 -SHA512 (jdk-updates-jdk11u-jdk-11.0.9+4-4curve.tar.xz) = 8e24c9e88d82eae05c4a22ff8c80f9da3f3ddfd9a4e8cae7aacde1eb4536946d69035352348e9ff2744525a7184b590dd0c481c24289eea77bac21b220a75cbc +SHA512 (jdk-updates-jdk11u-jdk-11.0.9+5-4curve.tar.xz) = e3a4f580a3e69724772cd2d5716cae3e714368761aedb8c23d85b25f125bea10c0980d1df3ba03095da72a55490b1b7e9236f72a0381819bcd8107e57f5fe542
commit 5d29ebd963d552acdb8fc6f9ba62d19a934e4b40 Author: Andrew Hughes gnu.andrew@redhat.com Date: Fri Sep 4 16:29:17 2020 +0000
Update to jdk-11.0.9+4 (EA)
diff --git a/.gitignore b/.gitignore index 8061ead..cc55090 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ /shenandoah-jdk11-shenandoah-jdk-11.0.9+1-4curve.tar.xz /jdk-updates-jdk11u-jdk-11.0.9+2-4curve.tar.xz /jdk-updates-jdk11u-jdk-11.0.9+3-4curve.tar.xz +/jdk-updates-jdk11u-jdk-11.0.9+4-4curve.tar.xz diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index e6848fb..72b14ba 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -258,7 +258,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 3 +%global buildver 4 %global rpmrelease 0 #%%global tagsuffix "" # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit @@ -1962,6 +1962,9 @@ require "copy_jdk_configs.lua"
%changelog +* Thu Sep 03 2020 Andrew Hughes gnu.andrew@redhat.com - 1:11.0.9.4-0.0.ea +- Update to jdk-11.0.9+4 (EA) + * Wed Aug 19 2020 Andrew Hughes gnu.andrew@redhat.com - 1:11.0.9.3-0.0.ea - Update to jdk-11.0.9+3 (EA)
diff --git a/sources b/sources index 0d273ed..2163af2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 -SHA512 (jdk-updates-jdk11u-jdk-11.0.9+3-4curve.tar.xz) = 60078b367edac17bfa0c27f521c152d15c2defe02245e2dc120a1f9bc04c93a47bc8a1365912dfe13f6e2a41503da7f546c5e03491c4099d2a2844ce81180f00 +SHA512 (jdk-updates-jdk11u-jdk-11.0.9+4-4curve.tar.xz) = 8e24c9e88d82eae05c4a22ff8c80f9da3f3ddfd9a4e8cae7aacde1eb4536946d69035352348e9ff2744525a7184b590dd0c481c24289eea77bac21b220a75cbc
commit 193da0bb726ae998e7ac8478d9b9153b15ad9620 Author: Andrew Hughes gnu.andrew@redhat.com Date: Fri Aug 28 06:04:37 2020 +0000
Update to jdk-11.0.9+3 (EA)
diff --git a/.gitignore b/.gitignore index 3add2bb..8061ead 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ /shenandoah-jdk11-shenandoah-jdk-11.0.8+10-4curve.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.9+1-4curve.tar.xz /jdk-updates-jdk11u-jdk-11.0.9+2-4curve.tar.xz +/jdk-updates-jdk11u-jdk-11.0.9+3-4curve.tar.xz diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index ef7fb13..e6848fb 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -258,7 +258,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 2 +%global buildver 3 %global rpmrelease 0 #%%global tagsuffix "" # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit @@ -1962,6 +1962,9 @@ require "copy_jdk_configs.lua"
%changelog +* Wed Aug 19 2020 Andrew Hughes gnu.andrew@redhat.com - 1:11.0.9.3-0.0.ea +- Update to jdk-11.0.9+3 (EA) + * Tue Aug 11 2020 Andrew Hughes gnu.andrew@redhat.com - 1:11.0.9.2-0.0.ea - Update to jdk-11.0.9+2 (EA) - With Shenandoah now upstream in OpenJDK 11, we can use jdk-updates/jdk11 directly diff --git a/sources b/sources index 2dcd95c..0d273ed 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 -SHA512 (jdk-updates-jdk11u-jdk-11.0.9+2-4curve.tar.xz) = 5a9fb6c67c517a6afff840d7a334ce83bdd2bf36c9d3341ea44f0e902d07f134737d3f9dbf3c56e6d4d7258de5814aae7f9dde573698916924476ce215c4b0b9 +SHA512 (jdk-updates-jdk11u-jdk-11.0.9+3-4curve.tar.xz) = 60078b367edac17bfa0c27f521c152d15c2defe02245e2dc120a1f9bc04c93a47bc8a1365912dfe13f6e2a41503da7f546c5e03491c4099d2a2844ce81180f00
commit 9e08adb840fda8e32b705381b1a4c3e4968858b3 Author: Andrew Hughes gnu.andrew@redhat.com Date: Thu Aug 13 20:04:28 2020 +0000
Update to jdk-11.0.9+2 (EA)
With Shenandoah now upstream in OpenJDK 11, we can use jdk-updates/jdk11 directly
diff --git a/.gitignore b/.gitignore index 112fc16..3add2bb 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ /shenandoah-jdk11-shenandoah-jdk-11.0.8+9-4curve.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.8+10-4curve.tar.xz /shenandoah-jdk11-shenandoah-jdk-11.0.9+1-4curve.tar.xz +/jdk-updates-jdk11u-jdk-11.0.9+2-4curve.tar.xz diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 6a2fb6d..ef7fb13 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -258,8 +258,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 1 -%global rpmrelease 2 +%global buildver 2 +%global rpmrelease 0 #%%global tagsuffix "" # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit %if %is_system_jdk @@ -1053,7 +1053,7 @@ URL: http://openjdk.java.net/
# to regenerate source0 (jdk) run update_package.sh # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives -Source0: shenandoah-jdk%{majorver}-shenandoah-jdk-%{newjavaver}+%{buildver}%{?tagsuffix:-%{tagsuffix}}-4curve.tar.xz +Source0: jdk-updates-jdk%{majorver}u-jdk-%{newjavaver}+%{buildver}%{?tagsuffix:-%{tagsuffix}}-4curve.tar.xz
# Use 'icedtea_sync.sh' to update the following # They are based on code contained in the IcedTea project (3.x). @@ -1962,6 +1962,10 @@ require "copy_jdk_configs.lua"
%changelog +* Tue Aug 11 2020 Andrew Hughes gnu.andrew@redhat.com - 1:11.0.9.2-0.0.ea +- Update to jdk-11.0.9+2 (EA) +- With Shenandoah now upstream in OpenJDK 11, we can use jdk-updates/jdk11 directly + * Tue Aug 11 2020 Andrew Hughes gnu.andrew@redhat.com - 1:11.0.9.1-0.2.ea - Cleanup architecture and JVM feature handling in preparation for using upstreamed Shenandoah.
diff --git a/sources b/sources index 441b5b9..2dcd95c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671 -SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.9+1-4curve.tar.xz) = 85a9b5d2a26b1a70bab7a58950238d8b24c050a26ffc6a7b14143cd656840e4aba5a609501a214d4aa5660e8a398dd7886c41a4bce561555b1611e5f547a6dc8 +SHA512 (jdk-updates-jdk11u-jdk-11.0.9+2-4curve.tar.xz) = 5a9fb6c67c517a6afff840d7a334ce83bdd2bf36c9d3341ea44f0e902d07f134737d3f9dbf3c56e6d4d7258de5814aae7f9dde573698916924476ce215c4b0b9
commit f99bf8596689b1d082e93c86b4326ece12c7a8ad Author: Andrew Hughes gnu.andrew@redhat.com Date: Tue Aug 11 04:52:58 2020 +0000
Cleanup architecture and JVM feature handling in preparation for using upstreamed Shenandoah.
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index b5b4c63..6a2fb6d 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -79,14 +79,32 @@ # we need to distinguish between big and little endian PPC64 %global ppc64le ppc64le %global ppc64be ppc64 ppc64p7 +# Set of architectures which support multiple ABIs %global multilib_arches %{power64} sparc64 x86_64 -%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} s390x +# Set of architectures for which we build debug builds +%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x +# Set of architectures with a Just-In-Time (JIT) compiler +%global jit_arches %{debug_arches} %{arm} +# Set of architectures which run a full bootstrap cycle +%global bootstrap_arches %{jit_arches} +# Set of architectures which support SystemTap tapsets +%global systemtap_arches %{jit_arches} +# Set of architectures with a Ahead-Of-Time (AOT) compiler %global aot_arches x86_64 %{aarch64} +# Set of architectures which support the serviceability agent +%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} +# Set of architectures which support class data sharing +# See https://bugzilla.redhat.com/show_bug.cgi?id=513605 +# MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT +%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{arm} s390x +# Set of architectures for which we build the Shenandoah garbage collector +%global shenandoah_arches x86_64 %{aarch64} +# Set of architectures for which we build the Z garbage collector +%global zgc_arches x86_64
# By default, we build a debug build during main build on JIT architectures %if %{with slowdebug} -%ifarch %{jit_arches} -%ifnarch %{arm} +%ifarch %{debug_arches} %global include_debug_build 1 %else %global include_debug_build 0 @@ -94,15 +112,23 @@ %else %global include_debug_build 0 %endif -%else -%global include_debug_build 0 -%endif
-# On x86_64 and AArch64, we use the Shenandoah HotSpot -%ifarch x86_64 %{aarch64} +# On certain architectures, we compile the Shenandoah GC +%ifarch %{shenandoah_arches} %global use_shenandoah_hotspot 1 +%global shenandoah_feature shenandoahgc %else %global use_shenandoah_hotspot 0 +%global shenandoah_feature -shenandoahgc +%endif + +# On certain architectures, we compile the ZGC +%ifarch %{zgc_arches} +%global use_zgc_hotspot 1 +%global zgc_feature zgc +%else +%global use_zgc_hotspot 0 +%global zgc_feature -zgc %endif
%if %{include_debug_build} @@ -117,7 +143,7 @@ # is expected in one single case at the end of the build %global rev_build_loop %{build_loop2} %{build_loop1}
-%ifarch %{jit_arches} +%ifarch %{bootstrap_arches} %global bootstrap_build 1 %else %global bootstrap_build 1 @@ -198,7 +224,7 @@
-%ifarch %{jit_arches} +%ifarch %{systemtap_arches} %global with_systemtap 1 %else %global with_systemtap 0 @@ -233,7 +259,7 @@ %global top_level_dir_name %{origin} %global minorver 0 %global buildver 1 -%global rpmrelease 1 +%global rpmrelease 2 #%%global tagsuffix "" # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit %if %is_system_jdk @@ -349,13 +375,9 @@ exit 0
%define post_headless() %{expand: -%ifarch %{jit_arches} -# MetaspaceShared::generate_vtable_methods not implemented for PPC JIT -%ifnarch %{ppc64le} -# see https://bugzilla.redhat.com/show_bug.cgi?id=513605 +%ifarch %{share_arches} %{jrebindir -- %{?1}}/java -Xshare:dump >/dev/null 2>/dev/null %endif -%endif
PRIORITY=%{priority} if [ "%{?1}" == %{debug_suffix} ]; then @@ -445,10 +467,8 @@ alternatives \ %endif --slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \ --slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \ -%ifarch %{jit_arches} -%ifnarch s390x +%ifarch %{sa_arches} --slave %{_bindir}/jhsdb jhsdb %{sdkbindir -- %{?1}}/jhsdb \ -%endif %endif --slave %{_bindir}/jar jar %{sdkbindir -- %{?1}}/jar \ --slave %{_bindir}/jarsigner jarsigner %{sdkbindir -- %{?1}}/jarsigner \ @@ -640,12 +660,10 @@ exit 0 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libnio.so %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libprefs.so %{_jvmdir}/%{sdkdir -- %{?1}}/lib/librmi.so -# Zero and S390x don't have SA -%ifarch %{jit_arches} -%ifnarch s390x +# Some architectures don't have the serviceability agent +%ifarch %{sa_arches} %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsaproc.so %endif -%endif %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsctp.so %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsunec.so %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libunpack.so @@ -662,11 +680,9 @@ exit 0 %{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1* %{_mandir}/man1/unpack200-%{uniquesuffix -- %{?1}}.1* %{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/ -%ifarch %{jit_arches} -%ifnarch %{power64} +%ifarch %{share_arches} %attr(444, root, root) %ghost %{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/classes.jsa %endif -%endif %dir %{etcjavasubdir} %dir %{etcjavadir -- %{?1}} %dir %{etcjavadir -- %{?1}}/lib @@ -731,12 +747,10 @@ exit 0 %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jdeprscan %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jfr %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jimage -# Zero and S390x don't have SA -%ifarch %{jit_arches} -%ifnarch s390x +# Some architectures don't have the serviceability agent +%ifarch %{sa_arches} %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jhsdb %endif -%endif %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jinfo %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jlink %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jmap @@ -1508,9 +1522,7 @@ bash ../configure \ --with-extra-ldflags="%{ourldflags}" \ --with-num-cores="$NUM_PROC" \ --disable-javac-server \ -%ifarch x86_64 - --with-jvm-features=zgc \ -%endif + --with-jvm-features="%{shenandoah_feature},%{zgc_feature}" \ --disable-warnings-as-errors
# Debug builds don't need same targets as release for @@ -1950,6 +1962,9 @@ require "copy_jdk_configs.lua"
%changelog +* Tue Aug 11 2020 Andrew Hughes gnu.andrew@redhat.com - 1:11.0.9.1-0.2.ea +- Cleanup architecture and JVM feature handling in preparation for using upstreamed Shenandoah. + * Sun Aug 09 2020 Andrew Hughes gnu.andrew@redhat.com - 1:11.0.9.1-0.1.ea - Update to shenandoah-jdk-11.0.9+1 (EA) - Switch to EA mode for 11.0.9 pre-release builds.