From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id +Fv0EUBjl2KgJgAAbAwnHQ (envelope-from ) for ; Wed, 01 Jun 2022 15:01:52 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id QBXvEEBjl2KhfgEAG6o9tA (envelope-from ) for ; Wed, 01 Jun 2022 15:01:52 +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 CFA7C36818 for ; Wed, 1 Jun 2022 15:01:51 +0200 (CEST) Received: from localhost ([::1]:42158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwNyw-0003nN-U8 for larch@yhetil.org; Wed, 01 Jun 2022 09:01:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwNyC-0003hV-Vn for guix-patches@gnu.org; Wed, 01 Jun 2022 09:01:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56087) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwNyC-0003wu-E9 for guix-patches@gnu.org; Wed, 01 Jun 2022 09:01:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nwNyC-0002P0-D4 for guix-patches@gnu.org; Wed, 01 Jun 2022 09:01:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55751] [PATCH 5/8] gnu: openjdk13: Make reproducible. Resent-From: dannym@scratchpost.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Jun 2022 13:01:04 +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.16540884489149 (code B ref 55751); Wed, 01 Jun 2022 13:01:04 +0000 Received: (at 55751) by debbugs.gnu.org; 1 Jun 2022 13:00:48 +0000 Received: from localhost ([127.0.0.1]:49974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwNxw-0002NP-29 for submit@debbugs.gnu.org; Wed, 01 Jun 2022 09:00:48 -0400 Received: from dd30410.kasserver.com ([85.13.145.193]:50296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nwNxm-0002M4-Gy for 55751@debbugs.gnu.org; Wed, 01 Jun 2022 09:00:43 -0400 Received: from dayas.lan (84-115-234-55.cable.dynamic.surfer.at [84.115.234.55]) by dd30410.kasserver.com (Postfix) with ESMTPSA id CC1281120ECD; Wed, 1 Jun 2022 15:00:37 +0200 (CEST) From: dannym@scratchpost.org Date: Wed, 1 Jun 2022 15:00:08 +0200 Message-Id: <20220601130011.9910-6-dannym@scratchpost.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220601125741.9898-1-dannym@scratchpost.org> References: <20220601125741.9898-1-dannym@scratchpost.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1654088511; 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=pqtP1BZSFL4GaH+vRhy6QJiQOgtgo0Prb6zuGJiv1N4=; b=IklidBXcpuTOQu9BI9kplBSC59vHfz3uUWscP0uC+TzlTgJhsOcHLGQA5Ktt9gfnRghwg7 EihTBZdNrV2xSyY4EcOm6WFawxxk8IHowpUv75aPUWBSsKLUliaDf302DF/FPRPFYXHEF6 gr+7IcZTESd88O0Qby8eY7qBfkuFfEfPH64DM5ECmshscPq3RLLWWoFRQ/Ig93NtQ+1onI phgnhXbf8gIcN9Ow030MBj2oR4NVRPVUmcPcSs4jthkiZ6B/jB6NtXykAHqhCkNc+WPjCS XxdXAFNjISjnnKrB2T1VkFeRByNKAaZtxSPjfnX53SqfZDeI2BNSu5s63x2rPg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654088511; a=rsa-sha256; cv=none; b=inUDSt+s3hmmYskLOF/tjT7leEWa3RuKHeXVZQcSoXWPTZiAOuz/JfoqFhjj59ePBFdMSa XEL2sn+Y/AHNCkPnp/J+xPB9JgYZzV3euO64A1M1cd8ufsQl8HT0x2o8xLh48VgyzzfKcj ngDx0tYCs86oRFxC/9kirDTCrpbFoKC+tHs3IA3w/CxbO5Z8/3fmOcglDtLb/BcBSKSwWe LR3Gh0lSA3WLzYZDUiT9HEpN4+m4DsYt+wbfM7wjwuqD8Jt0OF+255I8etN2if33D5LSbU xq2w8Vu3X0lu814xD6wJLXYhIkOFl61g9VNrWsIYEwQktgYOy69G0aUBGY+opA== 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" X-Migadu-Spam-Score: -0.83 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" X-Migadu-Queue-Id: CFA7C36818 X-Spam-Score: -0.83 X-Migadu-Scanner: scn0.migadu.com X-TUID: WanCFUDUCDaE From: Danny Milosavljevic * 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 | 12 ++++++++++++ .../openjdk-13-classlist-reproducibility.patch | 11 +++++++++++ 3 files changed, 24 insertions(+) create mode 100644 gnu/packages/patches/openjdk-13-classlist-reproducibility.patch diff --git a/gnu/local.mk b/gnu/local.mk index eaf0e306fb..aab850b4f7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1583,6 +1583,7 @@ dist_patch_DATA = \ %D%/packages/patches/openjdk-10-module3-reproducibility.patch \ %D%/packages/patches/openjdk-10-module4-reproducibility.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/openssh-hurd.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 1a872ce786..7bf8527d67 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2189,11 +2189,23 @@ (define-public openjdk13 (sha256 (base32 "0wrrr0d7lz1v8qqm752mn4gz5l2vpl2kmx4ac3ysvk4mljc924hp")) + (patches + (search-patches "openjdk-13-classlist-reproducibility.patch" + "openjdk-10-jtask-reproducibility.patch")) (modules '((guix build utils))) (snippet `(begin (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) #t)))) + (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__") "")))))))) (inputs `(("alsa-lib" ,alsa-lib) ("cups" ,cups) 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 -- 2.36.1