From 103b458eeea38d1ab1bd6c1ba074d22bc2e02e24a28782fe0688d20c3d856554 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 14 Jun 2024 10:13:34 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=453 --- java-1_8_0-openjdk.changes | 1 - java-1_8_0-openjdk.spec | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index f222413..7f7dfe3 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -93,7 +93,6 @@ Sat Apr 20 20:17:41 UTC 2024 - Fridrich Strba * Bug fixes + Support make 4.4 - ------------------------------------------------------------------- Thu Mar 7 12:58:44 UTC 2024 - Fridrich Strba diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec index e6c3108..0494957 100644 --- a/java-1_8_0-openjdk.spec +++ b/java-1_8_0-openjdk.spec @@ -1048,7 +1048,7 @@ fi %dir %{_libdir}/jvm-private %doc %{buildoutputdir}images/j2sdk-image/jre/ASSEMBLY_EXCEPTION -%license %{buildoutputdir}images/j2sdk-image/jre/LICENSE +%license %{buildoutputdir}images/j2sdk-image/jre/LICENSE what %doc %{buildoutputdir}images/j2sdk-image/jre/THIRD_PARTY_README %dir %{_jvmdir}/%{sdkdir} From 7f64e9de277759fb793c999195c8dc84f5bc5e0cae0445d4ccad2b0896cd8ec2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 14 Jun 2024 10:50:53 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=454 --- java-1_8_0-openjdk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec index 0494957..e6c3108 100644 --- a/java-1_8_0-openjdk.spec +++ b/java-1_8_0-openjdk.spec @@ -1048,7 +1048,7 @@ fi %dir %{_libdir}/jvm-private %doc %{buildoutputdir}images/j2sdk-image/jre/ASSEMBLY_EXCEPTION -%license %{buildoutputdir}images/j2sdk-image/jre/LICENSE what +%license %{buildoutputdir}images/j2sdk-image/jre/LICENSE %doc %{buildoutputdir}images/j2sdk-image/jre/THIRD_PARTY_README %dir %{_jvmdir}/%{sdkdir} From 1ba1029fa199603f1e5505a516e67e6ae49d43d6755e8ad6b7937447ba6e3fce Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 14 Jun 2024 13:52:25 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=455 --- java-1_8_0-openjdk.changes | 8 ++++++++ java-1_8_0-openjdk.spec | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes index 7f7dfe3..6a58efa 100644 --- a/java-1_8_0-openjdk.changes +++ b/java-1_8_0-openjdk.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jun 14 13:31:41 UTC 2024 - Fridrich Strba + +- Fix condition enabling shenandoah GC only for Factory. It was by + mistake enabled for SLE too (bsc#1226274) +- Disable shenandoah for all distributions, since the shenandoah + hotspot tarball is rather out of sync. + ------------------------------------------------------------------- Mon May 6 17:41:21 UTC 2024 - Fridrich Strba diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec index e6c3108..d660cf3 100644 --- a/java-1_8_0-openjdk.spec +++ b/java-1_8_0-openjdk.spec @@ -128,11 +128,11 @@ %if 0%{?__isa_bits} %global bits %{__isa_bits} %endif -%if 0%{?suse_version} > 1500 && !0%{?sle_version} -%global with_shenandoah 1 -%else +#if 0%{?suse_version} > 1500 && !0%{?sle_version} +#global with_shenandoah 1 +#else %global with_shenandoah 0 -%endif +#endif %global NSS_LIBDIR %(pkg-config --variable=libdir nss) %bcond_without bootstrap %bcond_with zero @@ -502,7 +502,7 @@ sh autogen.sh %ifarch %{arm} --with-hotspot-src-zip=%{SOURCE2} \ %else -%if %{without zero} && %{with shenandoah} +%if %{without zero} && %{with_shenandoah} --with-hotspot-src-zip=%{SOURCE3} \ --with-hotspot-build=shenandoah \ %endif