From: Jim Meyering <meyering@redhat.com>
Date: Mon, 6 Sep 2010 05:49:48 +0000 (+0200)
Subject: maint: don't use obsolete gnulib modules
X-Git-Tag: v8.6~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edc69f915842fdbce0069b6fba03643ad448daf8;p=thirdparty%2Fcoreutils.git

maint: don't use obsolete gnulib modules

* bootstrap.conf (gnulib_modules): Use calloc-gnu, malloc-gnu
and realloc-gnu modules, rather than calloc, malloc and realloc.
The shorter-named modules are now deprecated.
(obsolete_gnulib_modules): Remove.
(gnulib_modules): Remove raise, strbprk; they're obsolete, too.
Move strtod, strtol here, from obsolete_gnulib_modules.
---

diff --git a/bootstrap.conf b/bootstrap.conf
index 77a209bf6f..e84424a99b 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -22,19 +22,6 @@ avoided_gnulib_modules='
   --avoid=dummy
 '
 
-# These modules are obsolete and can probably be removed soon,
-# but leave them in for now to minimize changes.
-obsolete_gnulib_modules='
-  atexit
-  memcmp
-  memcpy
-  memmove
-  memset
-  strcspn
-  strtod
-  strtol
-'
-
 # gnulib modules used by this package.
 gnulib_modules="
   $avoided_gnulib_modules
@@ -53,7 +40,7 @@ gnulib_modules="
   c-strcase
   c-strtod
   c-strtold
-  calloc
+  calloc-gnu
   canon-host
   canonicalize
   chown
@@ -145,7 +132,7 @@ gnulib_modules="
   long-options
   lstat
   maintainer-makefile
-  malloc
+  malloc-gnu
   manywarnings
   mbrtowc
   mbsalign
@@ -180,14 +167,13 @@ gnulib_modules="
   putenv
   quote
   quotearg
-  raise
   randint
   randperm
   readlink
   readtokens
   readtokens0
   readutmp
-  realloc
+  realloc-gnu
   regex
   remove
   rename
@@ -212,9 +198,10 @@ gnulib_modules="
   stpncpy
   strdup-posix
   strftime
-  strpbrk
   strsignal
+  strtod
   strtoimax
+  strtol
   strtoumax
   symlink
   sys_ioctl