mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-08-06 22:41:37 +00:00
1a253a2bb5
The latest versions of gettext rely on several changes to gnulib including both changes to modules and new modules and some previously gettext specific code being moved to gnulib. Backport these changes in order to allow updating gettext while using the local gnulib copy of sources. Add patch: - 640-mem-hash-map.patch - 645-next-prime.patch - 646-hashcode-string.patch - 647-hashkey-string.patch - 650-package-version.patch - 651-package-version-simplify.patch - 652-package-version-simplify-further.patch - 653-package-version-warning.patch - 660-version-stamp.patch - 689-vc-mtime.patch - 755-clean-temp-hashkey.patch - 795-string-desc-rename-functions.patch - 796-vc-mtime-less-read.patch - 797-vc-mtime-add-api.patch - 798-vc-mtime-add-api.patch - 799-vc-mtime-old-git.patch - 900-str_startswith-module.patch - 901-str_endswith-module.patch Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/16522 Signed-off-by: Robert Marko <robimarko@gmail.com>
65 lines
2.2 KiB
Diff
65 lines
2.2 KiB
Diff
From f47c5f2e21d0ccedb271b406e35b6963b23a64c4 Mon Sep 17 00:00:00 2001
|
|
From: Bruno Haible <bruno@clisp.org>
|
|
Date: Wed, 30 Apr 2025 13:11:01 +0200
|
|
Subject: [PATCH] clean-temp: Fix link error (regression yesterday).
|
|
|
|
* lib/clean-temp.c: Include hashkey-string.h.
|
|
(create_temp_dir): Use hashkey_string_* functions instead of
|
|
clean_temp_string_*.
|
|
* lib/clean-temp-private.h (clean_temp_string_equals,
|
|
clean_temp_string_hash): Remove declarations.
|
|
* modules/clean-temp (Depends-on): Add hashkey-string.
|
|
---
|
|
ChangeLog | 10 ++++++++++
|
|
lib/clean-temp-private.h | 3 ---
|
|
lib/clean-temp.c | 5 +++--
|
|
modules/clean-temp | 1 +
|
|
4 files changed, 14 insertions(+), 5 deletions(-)
|
|
|
|
--- a/lib/clean-temp-private.h
|
|
+++ b/lib/clean-temp-private.h
|
|
@@ -68,9 +68,6 @@ struct closeable_fd
|
|
#define descriptors clean_temp_descriptors
|
|
extern gl_list_t /* <closeable_fd *> */ volatile descriptors;
|
|
|
|
-extern bool clean_temp_string_equals (const void *x1, const void *x2);
|
|
-extern size_t clean_temp_string_hash (const void *x);
|
|
-
|
|
extern _GL_ASYNC_SAFE int clean_temp_asyncsafe_close (struct closeable_fd *element);
|
|
extern void clean_temp_init_asyncsafe_close (void);
|
|
|
|
--- a/lib/clean-temp.c
|
|
+++ b/lib/clean-temp.c
|
|
@@ -45,6 +45,7 @@
|
|
#include "xmalloca.h"
|
|
#include "glthread/lock.h"
|
|
#include "thread-optim.h"
|
|
+#include "hashkey-string.h"
|
|
#include "gl_xlist.h"
|
|
#include "gl_linkedhash_list.h"
|
|
#include "gl_linked_list.h"
|
|
@@ -221,11 +222,11 @@ create_temp_dir (const char *prefix, con
|
|
tmpdir->cleanup_verbose = cleanup_verbose;
|
|
tmpdir->subdirs =
|
|
gl_list_create_empty (GL_LINKEDHASH_LIST,
|
|
- clean_temp_string_equals, clean_temp_string_hash,
|
|
+ hashkey_string_equals, hashkey_string_hash,
|
|
NULL, false);
|
|
tmpdir->files =
|
|
gl_list_create_empty (GL_LINKEDHASH_LIST,
|
|
- clean_temp_string_equals, clean_temp_string_hash,
|
|
+ hashkey_string_equals, hashkey_string_hash,
|
|
NULL, false);
|
|
|
|
/* Create the temporary directory. */
|
|
--- a/modules/clean-temp
|
|
+++ b/modules/clean-temp
|
|
@@ -24,6 +24,7 @@ rmdir
|
|
xalloc
|
|
xalloc-die
|
|
xmalloca
|
|
+hashkey-string
|
|
linkedhash-list
|
|
linked-list
|
|
xlist
|