Due to my recent discovery of the problem with wcscoll in the
ru_RU.KOI8-R locale, I found that the gnulib regex module still
depended on the wcscoll module, even though it had been fixed not to
use the wcscoll function.  I fixed that (I thought) in gnulib.  Then I
removed a no-longer-needed explicit dependency in grep on the wcscoll
module.  Surprise!  That latter change broke several grep tests.
Tracking it down, I found that there was one more remaining dependency
from gnulib's regex module on wcscoll: via a use of HAVE_WCSCOLL,
which was no longer defined, once I'd removed the module dependency.

Bottom line: I removed that now-stale use of HAVE_WCSCOLL from
gnulib's regex_internal.h, and then, (with an update-to-latest gnulib)
removing the explicit module dependency from grep goes without a
hitch.
From c673cf0d83c5e9f23319362aa5e6168b4075673a Mon Sep 17 00:00:00 2001
From: Jim Meyering <[email protected]>
Date: Mon, 21 Oct 2013 07:49:18 -0700
Subject: [PATCH 1/2] maint: remove now-unused wcscoll module

* bootstrap.conf (gnulib_modules): Remove wcscoll; no longer used.
---
 bootstrap.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index ff61fd6..8f6f5a3 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -85,7 +85,6 @@ useless-if-before-free
 version-etc-fsf
 wchar
 wcrtomb
-wcscoll
 wctob
 wctype-h
 xalloc
-- 
1.8.4.1.559.gdb9bdfb


From 7a35413864e7e557050063a648caa452c38c160b Mon Sep 17 00:00:00 2001
From: Jim Meyering <[email protected]>
Date: Mon, 21 Oct 2013 15:01:04 -0700
Subject: [PATCH 2/2] gnulib: update to latest

---
 gnulib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnulib b/gnulib
index 53a617f..974b76b 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 53a617f5e118ec5642daa3da45fcef0bf5593b12
+Subproject commit 974b76b72e84d226e4bdfd9ec6f7d955e3d2a199
-- 
1.8.4.1.559.gdb9bdfb

Reply via email to