Update to the newest gnulib.

* gnulib-local/lib/hash.h.diff: Remove file.
* gnulib-local/lib/hash.c.diff: Remove file.
* gnulib-local/Makefile.am (EXTRA_DIST): Remove them.
* autogen.sh: Avoid module hashcode-string1.

diff --git a/autogen.sh b/autogen.sh
index 469341f260d89012627e61fbc2cb8b8da903ea35..2dafe6317293dac44115d3a25f029a465d3dab76 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -363,6 +363,7 @@ if ! $skip_gnulib; then
   GNULIB_MODULES_LIBGETTEXTLIB="$GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES $GNULIB_MODULES_TOOLS_OTHER"
   $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --tests-base=gnulib-tests --makefile-name=Makefile.gnulib --libtool --with-tests --local-dir=gnulib-local --local-symlink \
     --import \
+    --avoid=hashcode-string1 \
     --avoid=fdutimensat-tests --avoid=futimens-tests --avoid=utime-tests --avoid=utimens-tests --avoid=utimensat-tests \
     --avoid=array-list-tests --avoid=linked-list-tests --avoid=linkedhash-list-tests \
     `for m in $GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS; do echo --avoid=$m; done` \

diff --git a/gnulib b/gnulib
index c0e56f571eca7b84b629fce2b9b05be5c4c26137..64042bb91aea5f854ca8a8938e2b3f7d1935e4f1 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit c0e56f571eca7b84b629fce2b9b05be5c4c26137
+Subproject commit 64042bb91aea5f854ca8a8938e2b3f7d1935e4f1

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 9365d30564e55526a05176bbfd87eec09577ad33..3cadc75ff9adfac2e7673eab080cafab84c37caf 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -35,8 +35,6 @@ lib/getopt-core.h.diff \
 lib/gettext.h \
 lib/gl_array_list.h.diff \
 lib/gl_linkedhash_list.h.diff \
-lib/hash.c.diff \
-lib/hash.h.diff \
 lib/libxml/buf.c \
 lib/libxml/buf.h \
 lib/libxml/c14n.c \

diff --git a/gnulib-local/lib/hash.c.diff b/gnulib-local/lib/hash.c.diff
deleted file mode 100644 (file)
index c2c7314..0000000
--- a/gnulib-local/lib/hash.c.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- hash.c.orig        2020-07-04 10:21:00.491559357 +0200
-+++ hash.c     2020-07-04 10:22:00.536240305 +0200
-@@ -345,6 +345,8 @@
- 
- /* Allocation and clean-up.  */
- 
-+#if 0
-+
- #if USE_DIFF_HASH
- 
- /* About hashings, Paul Eggert writes to me (FP), on 1994-01-01: "Please see
-@@ -389,6 +391,8 @@
- 
- #endif /* not USE_DIFF_HASH */
- 
-+#endif
-+
- /* Return true if CANDIDATE is a prime number.  CANDIDATE should be an odd
-    number at least equal to 11.  */
- 

diff --git a/gnulib-local/lib/hash.h.diff b/gnulib-local/lib/hash.h.diff
deleted file mode 100644 (file)
index 4bc9690..0000000
--- a/gnulib-local/lib/hash.h.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- hash.h.orig        2020-07-04 10:20:48.099418874 +0200
-+++ hash.h     2020-07-04 10:21:37.279976514 +0200
-@@ -128,11 +128,15 @@
-  * Allocation and clean-up.
-  */
- 
-+#if 0
-+
- /* Return a hash index for a NUL-terminated STRING between 0 and N_BUCKETS-1.
-    This is a convenience routine for constructing other hashing functions.  */
- extern size_t hash_string (const char *string, size_t n_buckets)
-        _GL_ATTRIBUTE_PURE;
- 
-+#endif
-+
- extern void hash_reset_tuning (Hash_tuning *tuning);
- 
- typedef size_t (*Hash_hasher) (const void *entry, size_t table_size);