From 6e11b3ebea38671f8b1e0466613aeddc061f2e476c40fa4cfc4e2e1310e84b3e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 14 Jun 2021 06:23:13 +0000 Subject: [PATCH 1/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openj9?expand=0&rev=51 --- java-1_8_0-openj9.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec index 7a0e52d..f4f00a1 100644 --- a/java-1_8_0-openj9.spec +++ b/java-1_8_0-openj9.spec @@ -205,7 +205,7 @@ Provides: jre1.5.x Provides: jre1.6.x Provides: jre1.7.x Provides: jre1.8.x -ExclusiveArch: x86_64 ppc64le s390x +ExclusiveArch: x86_64 ppc64le s390x aarch64 %if %{bootcycle} BuildRequires: java-devel >= 1.7 BuildConflicts: java >= 9 From 19f8503ee61f1fcfc902b85a01870a5192d3ec56947ad8d6d7443110f65b54d1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 14 Jun 2021 07:05:49 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openj9?expand=0&rev=52 --- java-1_8_0-openj9.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec index f4f00a1..37d396a 100644 --- a/java-1_8_0-openj9.spec +++ b/java-1_8_0-openj9.spec @@ -73,6 +73,9 @@ %ifarch s390x %global archinstall s390x %endif +%ifarch %{aarch64} +%global archinstall aarch64 +%endif %if %{debug} %global debugbuild slowdebug %else From 5b71a46795e7894a734f2390e6b47d996db4bff94a3a549269e209065970eddd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 14 Jun 2021 07:54:17 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openj9?expand=0&rev=53 --- java-1_8_0-openj9.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec index 37d396a..ed1428b 100644 --- a/java-1_8_0-openj9.spec +++ b/java-1_8_0-openj9.spec @@ -16,6 +16,7 @@ # +%{!?aarch64:%global aarch64 aarch64 arm64 armv8} %global debug 0 %global bootcycle 1 # Convert an absolute path to a relative path. Each symbolic link is From 9c010d2a0f6dcb13d56a9b32b5a46af3019b6fdfb1e00cc70aedaa34b2cd3c2f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 14 Jun 2021 08:33:15 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openj9?expand=0&rev=54 --- java-1_8_0-openj9.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec index ed1428b..9185bf6 100644 --- a/java-1_8_0-openj9.spec +++ b/java-1_8_0-openj9.spec @@ -421,6 +421,9 @@ export CFLAGS="$EXTRA_CFLAGS" %endif bash configure \ +%ifarch %aarch64 + --enable-OMR_ARCH_AARCH64 \ +%endif --disable-zip-debug-info \ --with-milestone="fcs" \ --with-update-version=%{updatever} \ From 8a4a163c504eed8040feb0bed02f2dc6c2f9894e5a7e97f68416fdcf493fed83 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 14 Jun 2021 08:56:06 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openj9?expand=0&rev=55 --- java-1_8_0-openj9.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec index 9185bf6..ed1428b 100644 --- a/java-1_8_0-openj9.spec +++ b/java-1_8_0-openj9.spec @@ -421,9 +421,6 @@ export CFLAGS="$EXTRA_CFLAGS" %endif bash configure \ -%ifarch %aarch64 - --enable-OMR_ARCH_AARCH64 \ -%endif --disable-zip-debug-info \ --with-milestone="fcs" \ --with-update-version=%{updatever} \ From 4ed53a45cf13a869f46d9adf9f871f5047e3f7718f7921ae4fd0746edc6da8a0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 15 Jun 2021 12:57:23 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openj9?expand=0&rev=56 --- java-1_8_0-openj9.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec index ed1428b..1435df5 100644 --- a/java-1_8_0-openj9.spec +++ b/java-1_8_0-openj9.spec @@ -210,6 +210,9 @@ Provides: jre1.6.x Provides: jre1.7.x Provides: jre1.8.x ExclusiveArch: x86_64 ppc64le s390x aarch64 +%if %{?pkg_vcmp:%pkg_vcmp gcc-c++ >= 11}%{!?pkg_vcmp:0} +BuildRequires: libdwarf-devel >= 20210528 +%endif %if %{bootcycle} BuildRequires: java-devel >= 1.7 BuildConflicts: java >= 9 @@ -413,13 +416,6 @@ EXTRA_CPP_FLAGS="-Wno-error -Wno-maybe-uninitialized -std=gnu++98 -fno-delete-nu EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing" %endif -%if %{?pkg_vcmp:%pkg_vcmp gcc-c++ >= 11}%{!?pkg_vcmp:0} -EXTRA_CPP_FLAGS="$EXTRA_CPP_FLAGS -g -gdwarf-4" -EXTRA_CFLAGS="$EXTRA_CFLAGS -g -gdwarf-4" -export CXXFLAGS="$EXTRA_CPP_FLAGS" -export CFLAGS="$EXTRA_CFLAGS" -%endif - bash configure \ --disable-zip-debug-info \ --with-milestone="fcs" \ From 85f48f135b82e3fa2f546a56cac73a844c13c75aa1f9fd7883d91edacca478ea Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 18 Jun 2021 10:17:19 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openj9?expand=0&rev=57 --- java-1_8_0-openj9.changes | 7 +++++++ java-1_8_0-openj9.spec | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/java-1_8_0-openj9.changes b/java-1_8_0-openj9.changes index 4fd22ff..cd78ad3 100644 --- a/java-1_8_0-openj9.changes +++ b/java-1_8_0-openj9.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 18 10:15:55 UTC 2021 - Fridrich Strba + +- Remove the forcing of DWARF version 4, since the libdwarf in + factory works correctly with this build and DWARF5 symbol format +- Expand supported architectures to aarch64 + ------------------------------------------------------------------- Thu Jun 10 16:24:28 UTC 2021 - Fridrich Strba diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec index 1435df5..2752b4f 100644 --- a/java-1_8_0-openj9.spec +++ b/java-1_8_0-openj9.spec @@ -210,9 +210,6 @@ Provides: jre1.6.x Provides: jre1.7.x Provides: jre1.8.x ExclusiveArch: x86_64 ppc64le s390x aarch64 -%if %{?pkg_vcmp:%pkg_vcmp gcc-c++ >= 11}%{!?pkg_vcmp:0} -BuildRequires: libdwarf-devel >= 20210528 -%endif %if %{bootcycle} BuildRequires: java-devel >= 1.7 BuildConflicts: java >= 9