grep branch, master, updated. v2.12-18-g1e65a88

[Jim Meyering]

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 "grep".

The branch, master has been updated
       via  1e65a88a9ebbb4db7cd17fea8382e22c136e2688 (commit)
       via  10646e6a936233daa1c77abb8902ba9bf3007ba0 (commit)
      from  7aa698d36b5b2eeb8e90e7a327eb7ebe46d59e87 (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://git.savannah.gnu.org/cgit/grep.git/commit/?id=1e65a88a9ebbb4db7cd17fea8382e22c136e2688


commit 1e65a88a9ebbb4db7cd17fea8382e22c136e2688
Author: Jim Meyering <address@hidden>
Date:   Mon Jun 4 10:17:12 2012 +0200

    build: fix a subtly twisted "make distcheck" failure
    
    "make distcheck" would fail when, during a test build,
    an attempt to overwrite the deliberately-write-protected
    $(srcdir)/grep.pot file would fail.
    * bootstrap.conf (bootstrap_epilogue): Don't let the existence of
    a large sparse file in the build directory induce "make distcheck"
    failure.  The existence of a large sparse test file named 8T-or-so
    would make po/Makefile.in.in's use of grep (to search for "GNU grep"
    as an indication that this is a GNU package) exit 2 without generating
    any output, which made the first xgettext use --package-name=grep,
    while that same search for "GNU grep" would succeed when run
    from a pristine from-tarball build, thus making the second
    xgettext invocation use --package-name='GNU grep'.
    That mismatch:
    -"Project-Id-Version: grep 2.12.18-1080\n"
    +"Project-Id-Version: GNU grep 2.12.18-1080\n"
    led to the attempt by Makefile.in.in's grep.pot-update rule to
    overwrite ../../grep.pot in the read-only po/ source directory.

diff --git a/bootstrap.conf b/bootstrap.conf
index 57749b4..2b3563c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -129,4 +129,15 @@ tar        -
 bootstrap_epilogue()
 {
   perl -pi -e "s/address@hidden@/$package/g" README-release
+
+  # Since this is a "GNU" package, replace this line
+  #   if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null \
+  #      | grep -v 'libtool:' >/dev/null; then
+  # with this:
+  #   if true; then
+  # Why?  That pipeline searches all files in $(top_srcdir), and if you
+  # happen to have large files (or apparently large sparse files), the
+  # first grep may well run out of memory.
+  perl -pi -e 's/ LC_ALL=C grep .GNU .PACKAGE.*; then/ true; then/' \
+    po/Makefile.in.in
 }

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=10646e6a936233daa1c77abb8902ba9bf3007ba0


commit 1e65a88a9ebbb4db7cd17fea8382e22c136e2688
Author: Jim Meyering <address@hidden>
Date:   Mon Jun 4 10:17:12 2012 +0200

    build: fix a subtly twisted "make distcheck" failure
    
    "make distcheck" would fail when, during a test build,
    an attempt to overwrite the deliberately-write-protected
    $(srcdir)/grep.pot file would fail.
    * bootstrap.conf (bootstrap_epilogue): Don't let the existence of
    a large sparse file in the build directory induce "make distcheck"
    failure.  The existence of a large sparse test file named 8T-or-so
    would make po/Makefile.in.in's use of grep (to search for "GNU grep"
    as an indication that this is a GNU package) exit 2 without generating
    any output, which made the first xgettext use --package-name=grep,
    while that same search for "GNU grep" would succeed when run
    from a pristine from-tarball build, thus making the second
    xgettext invocation use --package-name='GNU grep'.
    That mismatch:
    -"Project-Id-Version: grep 2.12.18-1080\n"
    +"Project-Id-Version: GNU grep 2.12.18-1080\n"
    led to the attempt by Makefile.in.in's grep.pot-update rule to
    overwrite ../../grep.pot in the read-only po/ source directory.

diff --git a/bootstrap.conf b/bootstrap.conf
index 57749b4..2b3563c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -129,4 +129,15 @@ tar        -
 bootstrap_epilogue()
 {
   perl -pi -e "s/address@hidden@/$package/g" README-release
+
+  # Since this is a "GNU" package, replace this line
+  #   if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null \
+  #      | grep -v 'libtool:' >/dev/null; then
+  # with this:
+  #   if true; then
+  # Why?  That pipeline searches all files in $(top_srcdir), and if you
+  # happen to have large files (or apparently large sparse files), the
+  # first grep may well run out of memory.
+  perl -pi -e 's/ LC_ALL=C grep .GNU .PACKAGE.*; then/ true; then/' \
+    po/Makefile.in.in
 }

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

Summary of changes:
 bootstrap      |  159 ++++++++++++++++++++++++++++++++++++++------------------
 bootstrap.conf |   11 ++++
 cfg.mk         |    1 +
 gnulib         |    2 +-
 tests/init.sh  |    8 +++
 5 files changed, 130 insertions(+), 51 deletions(-)


hooks/post-receive
-- 
grep