From patchwork Mon Apr 8 18:46:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 62868 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 BA02527BBED; Mon, 8 Apr 2024 19:48:50 +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,URIBL_BLOCKED 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 AF1C527BBEA for ; Mon, 8 Apr 2024 19:48:49 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtu2D-00045t-PR; Mon, 08 Apr 2024 14:48:01 -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 1rtu2B-00043W-8f for guix-patches@gnu.org; Mon, 08 Apr 2024 14:47:59 -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 1rtu2B-00056s-0D for guix-patches@gnu.org; Mon, 08 Apr 2024 14:47:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtu2I-0005Xq-I5 for guix-patches@gnu.org; Mon, 08 Apr 2024 14:48:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70169] [PATCH v3 10/13] maint: Avoid EPS generation to fail silently, ensure reproducibility. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Apr 2024 18:48:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70169@debbugs.gnu.org Received: via spool by 70169-submit@debbugs.gnu.org id=B70169.171260206921090 (code B ref 70169); Mon, 08 Apr 2024 18:48:06 +0000 Received: (at 70169) by debbugs.gnu.org; 8 Apr 2024 18:47:49 +0000 Received: from localhost ([127.0.0.1]:47672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtu21-0005Ty-33 for submit@debbugs.gnu.org; Mon, 08 Apr 2024 14:47:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59328) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtu1u-0005Rn-5J for 70169@debbugs.gnu.org; Mon, 08 Apr 2024 14:47:43 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rtu1h-00054D-9a; Mon, 08 Apr 2024 14:47:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=T7faWWRYD8t7Svuv7znHaeJxYQZRV9ytZV3aD5SwHV0=; b=ejg1chT1aw2bGaXz974X Wt3thETdeee5+/EWi5wYPZxHFtqiNeLiNGgAy/JoT19ytFZmtI5sYjP2/6KVXolHJkw5utN0fp9y3 u804cFLrkQcCYtIV/C9lUEqCCChnaGoN/YY2bIcOOE+ng7cp6x+1AJDK1hrCNgRDEUyAm8Q727SIH Pc13uJ6m7PUhnfWxhuAc4FMtnSfdyt1flOeoneHQsybsy/Ags8MVhhzGfj8SYt0pjm/2q43/oV6Xs FvvKIHQJpIqjAuYSC+Ra6VPRme+jNmXdKDOS+ehNtIC0m/+4ceHH+sChFBOi+qr62Aiu3i5/TE1Fl wsVmeg+px5Brfw==; From: Janneke Nieuwenhuizen Date: Mon, 8 Apr 2024 18:46:53 +0000 Message-ID: <45268fc2a2b8d85454bb2971946f6ab90b394b50.1712600307.git.janneke@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 Currently, Graphviz' dot does not insert a %%CreationDate. ImageMagick's convert on PNG->EPS does insert a %%CreationDate but it respects SOURCE_DATE_EPOCH. * doc/local.mk (.png.eps): Split single shell command into separate recipe lines, prefixed by $(AM_V_at). (.dot.png): Likewise. Check that generated EPS file has no %%CreationDate. Change-Id: I5a03485c19c72f0c46411815c51290e52a8e5399 --- doc/local.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/local.mk b/doc/local.mk index 7a9840187a..e5ee06f6ee 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -152,12 +152,13 @@ DOT_OPTIONS = \ mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" .dot.eps: - $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \ - mv "$(srcdir)/$@.tmp" "$(srcdir)/$@" + $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp" + $(AM_v_at)! grep -q %%CreationDate "$(srcdir)/$@.tmp" + $(AM_V_at)mv "$(srcdir)/$@.tmp" "$@" .png.eps: - $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \ - mv "$@-tmp.eps" "$@" + $(AM_V_GEN)convert "$<" "$@-tmp.eps" + $(AM_V_at)mv "$@-tmp.eps" "$@" # We cannot add new dependencies to `%D%/guix.pdf' & co. (info "(automake) # Extending"). Using the `-local' rules is imperfect, because they may be