From patchwork Mon Jul 31 18:09:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 52441 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 F07ED27BBE9; Mon, 31 Jul 2023 19:11:47 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS 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 810FF27BBE2 for ; Mon, 31 Jul 2023 19:11:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qQXMb-0003yl-E1; Mon, 31 Jul 2023 14:11:25 -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 1qQXMG-0003qy-8P for guix-patches@gnu.org; Mon, 31 Jul 2023 14:11:06 -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 1qQXMG-00044R-09 for guix-patches@gnu.org; Mon, 31 Jul 2023 14:11:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qQXMF-0007OO-Se for guix-patches@gnu.org; Mon, 31 Jul 2023 14:11:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55751] [PATCH v2 5/7] gnu: openjdk13: Make reproducible. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Jul 2023 18:11:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55751 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55751@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 55751-submit@debbugs.gnu.org id=B55751.169082703628332 (code B ref 55751); Mon, 31 Jul 2023 18:11:03 +0000 Received: (at 55751) by debbugs.gnu.org; 31 Jul 2023 18:10:36 +0000 Received: from localhost ([127.0.0.1]:53539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQXLn-0007Mu-Vg for submit@debbugs.gnu.org; Mon, 31 Jul 2023 14:10:36 -0400 Received: from dd30410.kasserver.com ([85.13.145.193]:42172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQXLm-0007Mm-Jj for 55751@debbugs.gnu.org; Mon, 31 Jul 2023 14:10:35 -0400 Received: from nova.lan (84-115-230-178.cable.dynamic.surfer.at [84.115.230.178]) by dd30410.kasserver.com (Postfix) with ESMTPSA id 1C4AA1121EC3; Mon, 31 Jul 2023 20:09:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=scratchpost.org; s=kas202303142049; t=1690826976; bh=rg6+DT4KE/2u9YjeSnIS9Kw0bB0tFGVqRqifpG80kv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o+dG3WYlRUP6JJE9FCQ+YZje7OOa2y0NuFrl384Wtm3338dvAmRJrhWSnbYt86uwv rga8b+ae4oQkEUuQWunPR5BbnSzyBbk1pBZpBDna5lOnrWAaIVcnXhbFm8GsQf1qVf fYj1vTTLVPoop0LaIdtG/2Cem29CRu6cjxJ0gmBr5dPMVyhMKoSNV152QzoXpGunIg W9hOwtsWjRwgPYHZgbMl/Sdf2B8PjkLWWA87um+zb5y/Cy+DmkBZoYT4BV+zafdl8F hgV9Nbupb4+L57IszXwSy/d1wes0IAGFW2koDXwETcjdsFvQz0LegeN9Li29+y89Rv 8TubJNZYZoDrQ== From: Danny Milosavljevic Date: Mon, 31 Jul 2023 20:09:17 +0200 Message-Id: <20230731180919.28047-6-dannym@scratchpost.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230731180919.28047-1-dannym@scratchpost.org> References: <20230731180919.28047-1-dannym@scratchpost.org> MIME-Version: 1.0 X-Spamd-Bar: -- 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 * gnu/packages/patches/openjdk-13-classlist-reproducibility.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/java.scm (openjdk13)[source]: Add patch. [arguments]<#:phases>[remove-timestamping]: Modify phase. --- gnu/local.mk | 1 + gnu/packages/java.scm | 17 ++++++++++++++--- .../openjdk-13-classlist-reproducibility.patch | 11 +++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/openjdk-13-classlist-reproducibility.patch diff --git a/gnu/local.mk b/gnu/local.mk index 715e958248..7956b57669 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1676,6 +1676,7 @@ dist_patch_DATA = \ %D%/packages/patches/openjdk-10-pointer-comparison.patch \ %D%/packages/patches/openjdk-10-setsignalhandler.patch \ %D%/packages/patches/openjdk-11-classlist-reproducibility.patch \ + %D%/packages/patches/openjdk-13-classlist-reproducibility.patch \ %D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ %D%/packages/patches/openmw-assume-nonconst-SIGSTKSZ.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 66dcc5023e..d7cad12bf1 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1527,9 +1527,20 @@ (define-public openjdk12 (define-public openjdk13 (make-openjdk openjdk12 "13.0.13" "0pxf4dlig61k0pg7amg4mi919hzam7nzwckry01avgq1wj8ambji" - (source (origin - (inherit (package-source base)) - (patches '()))))) + (source (origin + (inherit (package-source base)) + (patches (search-patches "openjdk-13-classlist-reproducibility.patch" + "openjdk-10-jtask-reproducibility.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments openjdk12) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'remove-timestamping + (lambda _ + (substitute* + "src/hotspot/share/runtime/abstract_vm_version.cpp" + (("__DATE__") "") + (("__TIME__") "")))))))))) (define-public openjdk14 (make-openjdk diff --git a/gnu/packages/patches/openjdk-13-classlist-reproducibility.patch b/gnu/packages/patches/openjdk-13-classlist-reproducibility.patch new file mode 100644 index 0000000000..326f6875ec --- /dev/null +++ b/gnu/packages/patches/openjdk-13-classlist-reproducibility.patch @@ -0,0 +1,11 @@ +--- 6cllxkf0narh0b4wgx8npwjkznd7ifq0-openjdk-13.0.7-checkout/make/GenerateLinkOptData.gmk.orig 2022-04-04 17:20:33.012539984 +0200 ++++ 6cllxkf0narh0b4wgx8npwjkznd7ifq0-openjdk-13.0.7-checkout/make/GenerateLinkOptData.gmk 2022-04-04 17:20:51.181032859 +0200 +@@ -78,7 +78,7 @@ + $(CAT) $(LINK_OPT_DIR)/stderr $(JLI_TRACE_FILE) ; \ + exit $$exitcode \ + ) +- $(GREP) -v HelloClasslist $@.raw > $@ ++ $(GREP) -v HelloClasslist $@.raw | sort > $@ + + # The jli trace is created by the same recipe as classlist. By declaring these + # dependencies, make will correctly rebuild both jli trace and classlist