From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id QOnLHmJetGS2nAAASxT56A (envelope-from ) for ; Sun, 16 Jul 2023 23:17:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id yDHeHWJetGRVlAAAG6o9tA (envelope-from ) for ; Sun, 16 Jul 2023 23:17:22 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 47A864F842 for ; Sun, 16 Jul 2023 23:17:22 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1689542242; a=rsa-sha256; cv=none; b=Xgf4Wva8EcicOpxXEV7hWbs4jrsMRcPzVH2iysRuGOXxJ6RojP1gy0sjtgJQdCJpWHvmP2 FmVORdyUzb2v9rCE1FBrz5vsj3JjZ7EMGCOLqaHJJWvLFmIRrPa3Asi42gS93WObfE1Yu8 n/WNZZNvtNWwCUFlpp7eP2WUVTfGi5YXKV6sC09FiLWnGCyvawsLOgEJJ2v6kPrjj/+alw q5mJ0j3BZxnz8dCJbwkOz2pqGPZJRZ7xZUz5OzU9XgUtClGwBsJOF57oP+X9XRNeRn7crB 5puEqiewN/YPYY6PIOugaId+VBzNOdqNTKYrdosvAB8qcbz/04YOdzSGiYFX6A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1689542242; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=XwleM3qu9FzSQn8F8xEafPBYTvrrRvn4Of7ikroqrSU=; b=JeNmP9HEyhMOSjth/i5laCST+BNGu8hA49p6mb6iG+zyFKK4WaRezxFU1XXfXghnmldSZo Ny+3ew75ClOYglPfduslwdq/qF4GIBLH27EfYpeVHuNAZYnJBOaT4O1MXdDOao5zXjF2AQ UXa306yMFFnXw8qEmxmQvPxLVxoW6NVdba98mF1PkC4B5lNA0/5chpMJHhiSStIopirxZM FFQapDPMl0W94IeMYhYRnFS1je+nOxc5jkxFvALumNBwH7ZlaZVzJpQvHK/58PM3yCE0Sp 3z3owgfTRxK22nBMHeBOCn2A8SLZ4OltCixGZVaW/q4XD2FfMi1GS3FQYLT6tw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qL972-0005QG-FZ; Sun, 16 Jul 2023 17:17:04 -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 1qL970-0005Q8-LX for guix-patches@gnu.org; Sun, 16 Jul 2023 17:17:02 -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 1qL970-0006zt-DQ for guix-patches@gnu.org; Sun, 16 Jul 2023 17:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qL970-00053i-8J for guix-patches@gnu.org; Sun, 16 Jul 2023 17:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64670] [PATCH 1/1] gnu: openjdk: patches for aarch64 build (openjdk9|openjdk10). References: <20230716203552.180767-1-t1m@phrogstar.de> In-Reply-To: <20230716203552.180767-1-t1m@phrogstar.de> Resent-From: Tim Johann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Jul 2023 21:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64670@debbugs.gnu.org Cc: Tim Johann Received: via spool by 64670-submit@debbugs.gnu.org id=B64670.168954219719401 (code B ref 64670); Sun, 16 Jul 2023 21:17:02 +0000 Received: (at 64670) by debbugs.gnu.org; 16 Jul 2023 21:16:37 +0000 Received: from localhost ([127.0.0.1]:48694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qL96a-00052r-JM for submit@debbugs.gnu.org; Sun, 16 Jul 2023 17:16:37 -0400 Received: from ms-10.1blu.de ([178.254.4.101]:54706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qL96Y-00052h-2s for 64670@debbugs.gnu.org; Sun, 16 Jul 2023 17:16:36 -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 1qL96W-0001RZ-Mq; Sun, 16 Jul 2023 23:16:32 +0200 From: Tim Johann Date: Sun, 16 Jul 2023 23:16:29 +0200 Message-ID: <20230716211629.181979-1-t1m@phrogstar.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Con-Id: 303810 X-Con-U: 0-t1m X-Originating-IP: 176.199.211.189 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 47A864F842 X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: -3.15 X-Spam-Score: -3.15 X-TUID: yhEuSG5Cc4BE 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; + -- 2.41.0