[openwrt/openwrt] tools/elfutils: remove no-op copy of tdestroy()

LEDE Commits lede-commits at lists.infradead.org
Thu Apr 25 14:10:37 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/ddb7177c57e1515d9b170a2a35c2d2f341311a05

commit ddb7177c57e1515d9b170a2a35c2d2f341311a05
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Mon Apr 8 03:54:13 2024 -0400

    tools/elfutils: remove no-op copy of tdestroy()
    
    A false tdestroy() function was added in order to make elfutils build on
    macOS again. A previous commit added declarations for a real version of
    tdestroy() into gnulib, which is already imported, as well as the
    preprocessor flags and the triggers for the Makefile.am conditional in
    order to include the source to be built.
    
    Tested-by: Georgi Valkov <gvalkov at gmail.com> # MacOS
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
    Signed-off-by: Tony Ambardar <itugrok at yahoo.com>
---
 tools/elfutils/patches/100-portability.patch | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/tools/elfutils/patches/100-portability.patch b/tools/elfutils/patches/100-portability.patch
index 91fff1ca78..9a111c76d9 100644
--- a/tools/elfutils/patches/100-portability.patch
+++ b/tools/elfutils/patches/100-portability.patch
@@ -344,20 +344,6 @@
 +{
 +  return ppc_check_object_attribute(ebl, vendor, tag, value, tag_name, value_name);
 +}
---- a/lib/libeu.h
-+++ b/lib/libeu.h
-@@ -45,4 +45,11 @@ extern char *xasprintf(const char *fmt,
- extern uint32_t crc32 (uint32_t crc, unsigned char *buf, size_t len);
- extern int crc32_file (int fd, uint32_t *resp);
- 
-+#ifdef __APPLE__
-+static inline void tdestroy(void *root __attribute__ ((unused)),
-+			    void (*freekey)(void *) __attribute__ ((unused)))
-+{
-+}
-+#endif
-+
- #endif
 --- a/libdwfl/libdwflP.h
 +++ b/libdwfl/libdwflP.h
 @@ -31,6 +31,8 @@




More information about the lede-commits mailing list