I've just pushed these two:

>From 155c8148ae06dcbbdfb85837e4aebe0080b71d2a Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Thu, 10 Jun 2010 23:33:17 +0200
Subject: [PATCH 1/2] build: don't let a large sparse temporary file cause "make 
dist" to fail

* bootstrap.conf (bootstrap_epilogue): Replace the offending grep
command from po/Makefile.in.in's $(DOMAIN).pot-update rule.
---
 bootstrap.conf |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 576d308..6e85c9a 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -337,4 +337,15 @@ bootstrap_epilogue()
   m=gnulib-tests/gnulib.mk
   sed 's,\.\./\.\.,..,g' $m > $m-t
   mv -f $m-t $m
+
+  # 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/if LC_ALL=C grep .GNU .PACKAGE.*; then/if true; then/' \
+    po/Makefile.in.in
 }
--
1.7.1.501.g23b46


>From d9ddd4c5032d9d01df6cfeb30cfb73d185aad9b7 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@redhat.com>
Date: Fri, 11 Jun 2010 11:32:31 +0200
Subject: [PATCH 2/2] build: update gnulib submodule to latest

---
 gnulib |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnulib b/gnulib
index 34ccc00..ef5acf2 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 34ccc0097f0161afab82df3025b342d98ad63f01
+Subproject commit ef5acf202788003cdc70813756e173cd6b7dd5a1
--
1.7.1.501.g23b46

Reply via email to