guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/04: nls: Do not update po files on first make invocation.


From: guix-commits
Subject: 02/04: nls: Do not update po files on first make invocation.
Date: Mon, 3 May 2021 09:33:05 -0400 (EDT)

apteryx pushed a commit to branch version-1.3.0
in repository guix.

commit a23789bbbdd23b1130f0f2521ee8d68872b7fc2c
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Sun May 2 22:12:16 2021 +0200

    nls: Do not update po files on first make invocation.
    
    We need to update the minimal gettext version to take advantage of new
    features.  Before this patch, the first make invocation would modify
    po/guix and po/packages po files, and we advised to run `git checkout
    po` to clean the changes.
    
    * configure.ac (AM_GNU_GETTEXT_VERSION): Update to 0.19.1.
    * po/guix/Makevars: Set PO_DEPENDS_ON_POT to no.
    * po/packages/Makevars: Set PO_DEPENDS_ON_POT to no.
    
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 configure.ac         | 2 +-
 po/guix/Makevars     | 5 +++++
 po/packages/Makevars | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f8b9376..583b902 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl For the C++ code.  This must be used early.
 AC_USE_SYSTEM_EXTENSIONS
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT_VERSION([0.19.1])
 
 GUIX_SYSTEM_TYPE
 GUIX_ASSERT_SUPPORTED_SYSTEM
diff --git a/po/guix/Makevars b/po/guix/Makevars
index 363bf98..88a4e8c 100644
--- a/po/guix/Makevars
+++ b/po/guix/Makevars
@@ -26,3 +26,8 @@ EXTRA_LOCALE_CATEGORIES =
 # "make distcheck -j4".
 # See <https://lists.gnu.org/archive/html/bug-gettext/2014-08/msg00005.html>.
 DIST_DEPENDS_ON_UPDATE_PO = no
+
+# Ignore the timestamp of the .pot file, as .po files are updated by
+# `make download-po` only. This ensures po files are not modified on the
+# first `make` invocation.
+PO_DEPENDS_ON_POT = no
diff --git a/po/packages/Makevars b/po/packages/Makevars
index 39366fb..4cdb98d 100644
--- a/po/packages/Makevars
+++ b/po/packages/Makevars
@@ -22,3 +22,8 @@ EXTRA_LOCALE_CATEGORIES =
 # "make distcheck -j4".
 # See <https://lists.gnu.org/archive/html/bug-gettext/2014-08/msg00005.html>.
 DIST_DEPENDS_ON_UPDATE_PO = no
+
+# Ignore the timestamp of the .pot file, as .po files are updated by
+# `make download-po` only. This ensures po files are not modified on the
+# first `make` invocation.
+PO_DEPENDS_ON_POT = no



reply via email to

[Prev in Thread] Current Thread [Next in Thread]