From patchwork Sun Jul 16 20:35:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Johann X-Patchwork-Id: 51744 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2A24227BBE9; Sun, 16 Jul 2023 21:37:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 18F6E27BBE2 for ; Sun, 16 Jul 2023 21:37:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qL8UL-00015n-2f; Sun, 16 Jul 2023 16:37:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qL8UJ-00014n-0h for guix-patches@gnu.org; Sun, 16 Jul 2023 16:37:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qL8UI-0003jN-Pj for guix-patches@gnu.org; Sun, 16 Jul 2023 16:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qL8UI-00041o-In for guix-patches@gnu.org; Sun, 16 Jul 2023 16:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64671] [PATCH 1/1] gnu: openjdk: patches for aarch64 build (openjdk9|openjdk10). Resent-From: Tim Johann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Jul 2023 20:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64671 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64671@debbugs.gnu.org Cc: Tim Johann X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168953977115400 (code B ref -1); Sun, 16 Jul 2023 20:37:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jul 2023 20:36:11 +0000 Received: from localhost ([127.0.0.1]:48672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qL8TT-00040F-64 for submit@debbugs.gnu.org; Sun, 16 Jul 2023 16:36:11 -0400 Received: from lists.gnu.org ([2001:470:142::17]:47532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qL8TO-0003ze-CE for submit@debbugs.gnu.org; Sun, 16 Jul 2023 16:36:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qL8TJ-0000zS-2d for guix-patches@gnu.org; Sun, 16 Jul 2023 16:36:01 -0400 Received: from ms-10.1blu.de ([178.254.4.101]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qL8TH-0003X6-1o for guix-patches@gnu.org; Sun, 16 Jul 2023 16:36:00 -0400 Received: from [176.199.211.189] (helo=dolos.fritz.box) by ms-10.1blu.de with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qL8TD-0004X8-VU; Sun, 16 Jul 2023 22:35:56 +0200 From: Tim Johann Date: Sun, 16 Jul 2023 22:35:52 +0200 Message-ID: <20230716203552.180767-2-t1m@phrogstar.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230716203552.180767-1-t1m@phrogstar.de> References: <20230716203552.180767-1-t1m@phrogstar.de> MIME-Version: 1.0 X-Con-Id: 303810 X-Con-U: 0-t1m X-Originating-IP: 176.199.211.189 Received-SPF: pass client-ip=178.254.4.101; envelope-from=t1m@phrogstar.de; helo=ms-10.1blu.de X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches OpenJDK source code prior to version 11 have a duplicate 'using' statement in hotspot's interp_masm_aarch64.hpp, which let's compilation of openjdk@9.181 fail on aarch64, and in consequence all openjdk versions, since each version larger than major 9 depends on the next lower major version of openjdk. This patch will make openjdk available on aarch64, again. * gnu/packages/java.scm (openjdk9|openjdk10)[source](patches): adding patches to remove duplicate 'using' statements causing build to fail on aarch64. * gnu/packages/patches/openjdk-9-duplicate-using-declaration.patch, gnu/packages/patches/openjdk-10-duplicate-using-declaration.patch: New files --- gnu/packages/java.scm | 6 ++++-- .../openjdk-10-duplicate-using-declaration.patch | 15 +++++++++++++++ .../openjdk-9-duplicate-using-declaration.patch | 15 +++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/openjdk-10-duplicate-using-declaration.patch create mode 100644 gnu/packages/patches/openjdk-9-duplicate-using-declaration.patch diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5a6288581e..69c4e604a8 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -873,7 +873,8 @@ (define-public openjdk9 (base32 "1v92nzdqx07c35x945awzir4yk0fk22vky6fpp8mq9js930sxsz0")) (patches (search-patches "openjdk-9-pointer-comparison.patch" - "openjdk-9-setsignalhandler.patch")))) + "openjdk-9-setsignalhandler.patch" + "openjdk-9-duplicate-using-declaration.patch")))) (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) (arguments @@ -1060,7 +1061,8 @@ (define-public openjdk10 (patches (search-patches "openjdk-10-idlj-reproducibility.patch" "openjdk-10-pointer-comparison.patch" - "openjdk-10-setsignalhandler.patch")))) + "openjdk-10-setsignalhandler.patch" + "openjdk-10-duplicate-using-declaration.patch")))) (arguments (substitute-keyword-arguments (package-arguments openjdk9) ((#:phases phases) diff --git a/gnu/packages/patches/openjdk-10-duplicate-using-declaration.patch b/gnu/packages/patches/openjdk-10-duplicate-using-declaration.patch new file mode 100644 index 0000000000..48cded60e3 --- /dev/null +++ b/gnu/packages/patches/openjdk-10-duplicate-using-declaration.patch @@ -0,0 +1,15 @@ +Patch from changeset of openjdk11: +https://hg.openjdk.org/jdk-updates/jdk11u/rev/15cc1c8a6371 + +diff -u -r openjdk-10.alt/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp openjdk-10/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp +--- openjdk-10.alt/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp 2023-07-16 14:33:27.570165136 +0200 ++++ openjdk-10/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp 2023-07-16 14:34:55.325163199 +0200 +@@ -39,8 +39,6 @@ + protected: + + protected: +- using MacroAssembler::call_VM_leaf_base; +- + // Interpreter specific version of call_VM_base + using MacroAssembler::call_VM_leaf_base; + diff --git a/gnu/packages/patches/openjdk-9-duplicate-using-declaration.patch b/gnu/packages/patches/openjdk-9-duplicate-using-declaration.patch new file mode 100644 index 0000000000..3fa933ad36 --- /dev/null +++ b/gnu/packages/patches/openjdk-9-duplicate-using-declaration.patch @@ -0,0 +1,15 @@ +Patch from changeset of openjdk11: +https://hg.openjdk.org/jdk-updates/jdk11u/rev/15cc1c8a6371 + +diff -u -r openjdk-9.alt/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp openjdk-9/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp +--- openjdk-9.alt/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp 2023-07-15 19:03:09.063790084 +0200 ++++ openjdk-9/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp 2023-07-15 19:01:12.289447197 +0200 +@@ -39,8 +39,6 @@ + protected: + + protected: +- using MacroAssembler::call_VM_leaf_base; +- + // Interpreter specific version of call_VM_base + using MacroAssembler::call_VM_leaf_base; +