From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id kEnHLJGcH2YbMgAA62LTzQ:P1 (envelope-from ) for ; Wed, 17 Apr 2024 11:55:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id kEnHLJGcH2YbMgAA62LTzQ (envelope-from ) for ; Wed, 17 Apr 2024 11:55:29 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=baD2zvu9; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1713347729; a=rsa-sha256; cv=none; b=QO8ihZj9QWPxsRpZUWd2E2EiBceLNAfIh3ed3DUPzPZXkJ0KX9EQyCJhgiPpwHREouGn6A XTXgrGgZszLbDi6o+20X6YOQlikGzG0cQee4lwVKqVttnw5uvGJq/gJjavVNYduYbZlzyr NWqC98ZRVYrUxj8SftMlu5QG0dkwm7xz4d8EM68pp3+MVtbR0PnsZ6alhTOzZXliauNJjk UXcVNS466ZIQrzc6yZYVqpkfxhF9eOi//ut9OROpQMZm8x1wZSQV3Z1L70+hg0v8fhpc9w 1pj+HQsLIazlsWLimSLuNQdbBAqfw7AhRGsMeFqxjegCp9HcrgV4RZbQMZbtyA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=baD2zvu9; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1713347729; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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:dkim-signature; bh=8AejkK/u0zFIXXzdUR6ZcSPHi28dhCnV3kGEsT1Cpwc=; b=ZJ+DIt6/QLivQoqaFA6r5yF29JLcMM+V5X9IHAbIDVDs0Zzg2I6aZMIxShIMwOhbhWpaQO UwPjoSD/vogAOTqkL8nmazzq/iJkTA2wxBvm/KAKb+6Xx8ir90hLklDCG8tri9a9oA2A3c CGQnr1s9b57lrLHVy5E7CYdlBUPOp4WEvdx3/ERe+h6ad47OX0ghvu681CNHAoHpiYcUAJ LXNii9Gzqqb3Wmh+9su4JfmQMnnCwEMaObSSTSW3Tmz16PbV9r1MbP3JnAJgUwV6iNLxWY RA9w9DPZrIDOS2kplDD22NO3kOM5yCPhD92IORb4KaxywRkICXgqiaV9sKbdUg== 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 8F58B25B46 for ; Wed, 17 Apr 2024 11:55:29 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rx20M-0004kd-6e; Wed, 17 Apr 2024 05:55:02 -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 1rx20I-0004jr-RX for guix-patches@gnu.org; Wed, 17 Apr 2024 05:54:58 -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 1rx20G-0006lG-4L for guix-patches@gnu.org; Wed, 17 Apr 2024 05:54:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rx20S-0005NN-NL for guix-patches@gnu.org; Wed, 17 Apr 2024 05:55:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70380] [PATCH v3 3/4] Revert "maint: Generate 'doc/version-LANG.texi' reproducibly." Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Apr 2024 09:55:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70380 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70380@debbugs.gnu.org Received: via spool by 70380-submit@debbugs.gnu.org id=B70380.171334766020158 (code B ref 70380); Wed, 17 Apr 2024 09:55:08 +0000 Received: (at 70380) by debbugs.gnu.org; 17 Apr 2024 09:54:20 +0000 Received: from localhost ([127.0.0.1]:45801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rx1zf-0005Ex-B3 for submit@debbugs.gnu.org; Wed, 17 Apr 2024 05:54:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rx1zL-0005A8-Eg for 70380@debbugs.gnu.org; Wed, 17 Apr 2024 05:54:05 -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 1rx1z3-0006fB-72; Wed, 17 Apr 2024 05:53:41 -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=8AejkK/u0zFIXXzdUR6ZcSPHi28dhCnV3kGEsT1Cpwc=; b=baD2zvu9QuiQipL0LnOW ezPZHLGvFVXls9L7JeCF23CIYhcyj/TtRrPcB4Bz5Ibwee+UHnwM7vO+Waveorl5pDxg62MKx2+g8 f51En1Mt/FvKX4u1Ma/XggwumtAW2myGsS83FNNBE+vp79FV0vo2GpMovbxs3QGf30J/dCI5GlV3O p0z+dOlf2YUB6T15TOSEsIODg3OWIy6INU35rxlLXR4yvdFX2RxGqua+EV1b3gmLF0RkO7KIM+eNo frGYrecW017ajtjMqoqTUf5Y+/IVPOQHAIvXoMedz8jCoYQU1tvN8rir0R0jQhnX0b7VWf/huCAU5 AziTqya11xWu5w==; From: Janneke Nieuwenhuizen Date: Wed, 17 Apr 2024 11:53:30 +0200 Message-ID: <99333fca4662a435c68d6a54f5f6e28aecc21103.1713340674.git.janneke@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: -5.58 X-Migadu-Queue-Id: 8F58B25B46 X-Migadu-Spam-Score: -5.58 X-Migadu-Scanner: mx10.migadu.com X-TUID: ENLF4AStkFE3 Using `build-aux/mdate-from-git.scm' makes this no longer necessary. This reverts commit 0e4ead187d83a958ca0deb54857c04967e84d68b. Change-Id: I9177828f90fa7f7e256bc72fdff35a2fab355780 --- doc/local.mk | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/doc/local.mk b/doc/local.mk index 130f40ece9..77d48902b6 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -260,32 +260,26 @@ endif # Reproducible tarball -# Define a rule to build `version[LANG].texi' reproducibly using metadata from -# Git rather than using metadata from the filesystem. -define version.texi-from-git -$(srcdir)/doc/stamp-$(1): $(srcdir)/$(2) $(top_srcdir)/configure - $$(AM_V_GEN)set -e; \ - export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \ - export TZ=UTC0; \ - timestamp="$$$$(git log --pretty=format:%ct -n1 -- "$$<" \ - 2>/dev/null \ - || echo $$(SOURCE_DATE_EPOCH))" \ - dmy=$$$$(date --date="@$$$$timestamp" "+%-d %B %Y"); \ - my=$$$$(date --date="@$$$$timestamp" "+%B %Y"); \ - { echo "@set UPDATED $$$$dmy"; \ - echo "@set UPDATED-MONTH $$$$my"; \ - echo "@set EDITION $$$(VERSION)"; \ - echo "@set VERSION $$$(VERSION)"; } > "$$@-t"; \ - mv "$$@-t" "$$@"; \ - cp -p "$$@" "$$(srcdir)/doc/version$(3).texi" -endef - -# Generate rules for stamp-vti and stamp-N that create version.texi and -# version-LANG.texi to override the Autotools versions that use timestamps -# embedded in the file-system. These are expected to generate warnings: +# Generate 'version.texi' reproducibly using metadata from Git rather than +# using metadata from the filesystem. This is expected to generate warnings: # # Makefile:7376: warning: overriding recipe for target 'doc/stamp-vti' # Makefile:5098: warning: ignoring old recipe for target 'doc/stamp-vti' +$(srcdir)/doc/stamp-vti: $(srcdir)/doc/guix.texi $(top_srcdir)/configure + $$(AM_V_GEN)set -e; \ + export LANG=C LANGUAGE=C LC_ALL=C LC_TIME=C; \ + export TZ=UTC0; \ + timestamp=$$(git log --pretty=format:%ct -n1 -- $< 2>/dev/null \ + || echo $(SOURCE_DATE_EPOCH)) \ + dmy=$$(date --date="@$$timestamp" "+%-d %B %Y"); \ + my=$$(date --date="@$$timestamp" "+%B %Y"); \ + { echo "@set UPDATED $$dmy"; \ + echo "@set UPDATED-MONTH $$my"; \ + echo "@set EDITION $(VERSION)"; \ + echo "@set VERSION $(VERSION)"; } > $@-t; \ + mv $@-t $@; \ + cp $@ $(srcdir)/doc/version.texi + i:=0 $(eval $(call version.texi-from-git,vti,doc/guix.texi,)) $(foreach lang, $(MANUAL_LANGUAGES), \ -- 2.41.0