From patchwork Thu Jan 18 21:59:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 59105 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 9A86B27BBEA; Thu, 18 Jan 2024 22:00:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=ham 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 8210327BBE2 for ; Thu, 18 Jan 2024 22:00:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQaQg-0006cF-M9; Thu, 18 Jan 2024 17:00:06 -0500 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 1rQaQc-0006bg-8A for guix-patches@gnu.org; Thu, 18 Jan 2024 17:00:03 -0500 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 1rQaQb-0004a8-UB for guix-patches@gnu.org; Thu, 18 Jan 2024 17:00:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQaQd-0005GM-N2 for guix-patches@gnu.org; Thu, 18 Jan 2024 17:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68575] [PATCH core-updates 3/3] gnu: openjdk11: Fix build. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Jan 2024 22:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68575 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68575@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 68575-submit@debbugs.gnu.org id=B68575.170561519120093 (code B ref 68575); Thu, 18 Jan 2024 22:00:03 +0000 Received: (at 68575) by debbugs.gnu.org; 18 Jan 2024 21:59:51 +0000 Received: from localhost ([127.0.0.1]:56886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQaQQ-0005Dx-NY for submit@debbugs.gnu.org; Thu, 18 Jan 2024 16:59:50 -0500 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]:50594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQaQP-0005DP-6v for 68575@debbugs.gnu.org; Thu, 18 Jan 2024 16:59:49 -0500 Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-681397137afso1069796d6.1 for <68575@debbugs.gnu.org>; Thu, 18 Jan 2024 13:59:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1705615181; x=1706219981; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S/jz9dCLlJmQAIAon9ct6/eX/xcu56qmvBsajcDT5/Y=; b=OyYYU0nWAoB1w3ebcsZOlDtvWNxDbRV+/OhNqFCZwrWQl09H5mfhwssvgDSElm8lx6 w6TPAznqLwOVtx2FZmNIva9jJf06EH7dCwy7X6nOg7U9CN4Q+9cwzx2F+BtqlkNOIH/p YqFnUnXKATUKurwIw8tFrDPWujOeD2Dn4Uu4KFa+uBlJyN7sDKZ0xSxWSJ2ctF7kn//T seUAv8aLNMrJ5ZrKWCg73bmlAnMjI+c8JMat5clCDhq8NoF57HJzzH2A/Oq9Gva5EMCw UjnKDCSsar+jH0O8q7vCV8/J4X9C1IeB7SYFQALhJA1Sp1DeTiNhLLlKLyKp7kJMU1uC CmJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705615181; x=1706219981; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S/jz9dCLlJmQAIAon9ct6/eX/xcu56qmvBsajcDT5/Y=; b=UuwE+sRjmWruMj4QDhaa7JtWDdNsBA7/StamJEHGgJF20tTkfon6g52wsj/7E0Mwdt +fn6m3skaJHTie8C3qEklGcQhrGCzrBVNTcdoOU9OG/d5USy2cKcCWrx9ZUBiX0Wxwjg yjDRKOMgAuDXT96R3Pvnj0yHZt5nePvgqlhGemBzrVjRrZGjUCXVkFskqnFkaPm959wk x8YjOISWh2867nXfSmJKRye4BwGlyvmWNgB/2ARjaqhDSUenYpjDz3V9hYMhg0zqAHB2 ixVhIyqIxb+4dp5C/yAtVDzGLg5RR5JYqM0wqUasyHUJLGP4pmSYBWc3YvbQpHwozIGl R0Pg== X-Gm-Message-State: AOJu0YxYZ3j3l67ZKEOfGCLZ1Yo/KFNSIf26rVLBNjUofAflj+ifgzeb 7yNpAZ4XuEVdcIK/Pk/klfFuPkltjjAvKdklBocVHdJKt4RqgBmHWiw5fVn9jT2yELxjQ3Z1UDo t X-Google-Smtp-Source: AGHT+IE+znbMC03BQgJbDJw9Q6FNPlGDUiWDY2WmWvyo1C0M3nWo4rK9Xr678bHE9TRtxZwSGsgM7A== X-Received: by 2002:a05:6214:27c4:b0:67f:641e:bfc5 with SMTP id ge4-20020a05621427c400b0067f641ebfc5mr2173119qvb.26.1705615181712; Thu, 18 Jan 2024 13:59:41 -0800 (PST) Received: from ip-172-31-16-52.us-east-2.compute.internal (ec2-3-141-183-131.us-east-2.compute.amazonaws.com. [3.141.183.131]) by smtp.gmail.com with ESMTPSA id cv16-20020ad44d90000000b0068179afede6sm1856601qvb.100.2024.01.18.13.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 13:59:41 -0800 (PST) From: Greg Hogan Date: Thu, 18 Jan 2024 21:59:35 +0000 Message-Id: <20240118215935.5178-3-code@greghogan.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240118215935.5178-1-code@greghogan.com> References: <20240118215935.5178-1-code@greghogan.com> MIME-Version: 1.0 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/java.scm (openjdk11)[arguments]: Replace reference to 'remove-diz-file phase with 'remove-extraneous-files. Change-Id: I932be9202459b41d82686839d309d1785011bf90 --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9ff85355d5..2efb435698 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1399,7 +1399,7 @@ (define (icedtea-or-openjdk? path) ((name . dir) dir)) outputs))))) - (add-after 'remove-diz-file 'strip-archive-timestamps + (add-after 'remove-extraneous-files 'strip-archive-timestamps (lambda _ (use-modules (ice-9 binary-ports) (rnrs bytevectors))