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.
This commit is contained in:
Bruno Haible 2025-04-30 03:52:29 +02:00
parent 2bcec7b8c2
commit 402fd1b672
5 changed files with 2 additions and 41 deletions

View File

@ -343,6 +343,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` \

2
gnulib

@ -1 +1 @@
Subproject commit 4a1b37a5717ddccd31c3516cfb7dba0b9eab2252
Subproject commit 64042bb91aea5f854ca8a8938e2b3f7d1935e4f1

View File

@ -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 \

View File

@ -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. */

View File

@ -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);