GNU C Library master sources branch master updated. glibc-2.27.9000-82-g56456a2

[aurel32 at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  56456a2aadf0522b51ea55be1291ca832c5d0524 (commit)
      from  dd1efd8c56f6e54667d66b2302f9590736546414 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=56456a2aadf0522b51ea55be1291ca832c5d0524

commit 56456a2aadf0522b51ea55be1291ca832c5d0524
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Sun Feb 18 18:15:47 2018 +0100

    intl/tst-gettext: fix failure with newest msgfmt
    
    Since upstream gettext commit d13f165b83 (msgfmt: Remove
    POT-Creation-Date field from the header in the output.), msgfmt does not
    copy the POT-Creation-Date field in the header entry from the po file to
    the mo file anymore. This breaks the assumption that we can test gettext
    by comparing each message in the po files with the corresponding string
    return by gettext. This makes the intl/tst-gettext to fail.
    
    While it would have been possible to modify the po2test.awk script to
    also strip the line POT-Creation-Date field when creating the msgs.h
    file, it would not work with both the old and new msgfmt.
    
    Instead create a tst-gettext-de.po file from de.po by removing the
    POT-Creation-Date line. Another alternative would be to use a static
    tst-gettext-de.po file, but I guess the reason for using de.po is to
    also catch issues caused by newly added strings.
    
    As tst-catgets also uses msg.h, it should also be updated. Instead of
    using the new tst-gettext-de.po file, the patch modifies xopen-msg.awk
    to avoid creating a second catgets->intl dependency.
    
    Changelog:
    	[BZ #21508]
    	* catgets/xopen-msg.awk: Ignore POT-Creation-Date line.
    	* intl/Makefile ($(objpfx)tst-gettext-de.po): Generate
    	intl/tst-gettext-de.po from po/de.po by removing the
    	POT-Creation-Date line.
    	($(objpfx)msgs.h): Depend on $(objpfx)tst-gettext-de.po instead of
    	../po/de.po.
    	* intl/tst-gettext.sh: Use ${objpfx}tst-gettext-de.po instead of
    	../po/de.po.

diff --git a/ChangeLog b/ChangeLog
index 4e8411f..9be766b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2018-02-18  Aurelien Jarno  <aurelien@aurel32.net>
+
+	[BZ #21508]
+	* catgets/xopen-msg.awk: Ignore POT-Creation-Date line.
+	* intl/Makefile ($(objpfx)tst-gettext-de.po): Generate
+	intl/tst-gettext-de.po from po/de.po by removing the
+	POT-Creation-Date line.
+	($(objpfx)msgs.h): Depend on $(objpfx)tst-gettext-de.po instead of
+	../po/de.po.
+	* intl/tst-gettext.sh: Use ${objpfx}tst-gettext-de.po instead of
+	../po/de.po.
+
 2018-02-17  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* mach/Makefile (headers): Add mach/param.h.
diff --git a/catgets/xopen-msg.awk b/catgets/xopen-msg.awk
index a13d6fa..bab0f6b 100644
--- a/catgets/xopen-msg.awk
+++ b/catgets/xopen-msg.awk
@@ -58,6 +58,11 @@ $1 ~ "msg(id|str)" {
     next
 }
 
+/^"POT-Creation-Date: [0-9-]+ [0-9:+-]+\\n"/ {
+    # Ignore POT-Creation-Date to match what is done in intl/Makefile.
+    next
+}
+
 /^".*"/ {
     # Append to current message
     sub(/^"/, "", $0)
diff --git a/intl/Makefile b/intl/Makefile
index 2219717..672edf1 100644
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -120,7 +120,11 @@ $(objpfx)tst-gettext6.out: $(gen-locales)
 $(objpfx)tst-translit.out: $(gen-locales)
 endif
 
-$(objpfx)msgs.h: po2test.awk ../po/de.po
+$(objpfx)tst-gettext-de.po: ../po/de.po
+	$(make-target-directory)
+	LC_ALL=C $(AWK) '!/^"POT-Creation-Date: [0-9-]+ [0-9:+-]+\\n"$$/' $^ > $@
+
+$(objpfx)msgs.h: po2test.awk $(objpfx)tst-gettext-de.po
 	$(make-target-directory)
 	LC_ALL=C $(AWK) -f $^ > $@
 
diff --git a/intl/tst-gettext.sh b/intl/tst-gettext.sh
index af9c7d7..0c65583 100755
--- a/intl/tst-gettext.sh
+++ b/intl/tst-gettext.sh
@@ -42,9 +42,9 @@ mkdir -p ${objpfx}domaindir/existing-locale/LC_MESSAGES
 mkdir -p ${objpfx}domaindir/existing-locale/LC_TIME
 # Populate them.
 msgfmt -o ${objpfx}domaindir/existing-locale/LC_MESSAGES/existing-domain.mo \
-       -f ../po/de.po
+       -f ${objpfx}tst-gettext-de.po
 msgfmt -o ${objpfx}domaindir/existing-locale/LC_TIME/existing-time-domain.mo \
-       -f ../po/de.po
+       -f ${objpfx}tst-gettext-de.po
 
 # Now run the test.
 ${test_program_prefix_before_env} \

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog             |   12 ++++++++++++
 catgets/xopen-msg.awk |    5 +++++
 intl/Makefile         |    6 +++++-
 intl/tst-gettext.sh   |    4 ++--
 4 files changed, 24 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources