janneke pushed a commit to branch wip-tarball
in repository guix.

commit 45268fc2a2b8d85454bb2971946f6ab90b394b50
Author: Janneke Nieuwenhuizen <[email protected]>
AuthorDate: Sat Apr 6 11:34:49 2024 +0200

    maint: Avoid EPS generation to fail silently, ensure reproducibility.
    
    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)/[email protected]" "$(srcdir)/$@"
 
 .dot.eps:
-       $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/[email protected]"; \
-       mv "$(srcdir)/[email protected]" "$(srcdir)/$@"
+       $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/[email protected]"
+       $(AM_v_at)! grep -q %%CreationDate "$(srcdir)/[email protected]"
+       $(AM_V_at)mv "$(srcdir)/[email protected]" "$@"
 
 .png.eps:
-       $(AM_V_GEN)convert "$<" "[email protected]"; \
-       mv "[email protected]" "$@"
+       $(AM_V_GEN)convert "$<" "[email protected]"
+       $(AM_V_at)mv "[email protected]" "$@"
 
 # We cannot add new dependencies to `%D%/guix.pdf' & co. (info "(automake)
 # Extending").  Using the `-local' rules is imperfect, because they may be

Reply via email to