Skip to content

Commit

Permalink
tools/elfutils: remove dirname
Browse files Browse the repository at this point in the history
In the 0.191 update dirname was used instead of <libgen.h> to fix the
poisoned basename error:
/usr/include/libgen.h:35:9: error: attempt to use poisoned "basename"
       35 | #define basename        __xpg_basename

However, doing this has lead to libelf.a pulling in xmalloc, xstrdup and
friends and statically linking them thus leading to a symbol name conflict
with FRR host build and anything else that links against libelf and uses
xmalloc and friends.

Well, it turns out that upstream has added a helper[1] for basename so it
can compile with musl 1.2.5 which dropped the basename declaration, but it
also means that we must NOT include <libgen.h> and that poisoned error is
intentional and added to prevent duplicate basename definitions.
This also means that for macOS we dont need to do any additional header
inclusions as the new helper takes care of basename.

So, to fix the symbol conflict we can simply drop the <dirname.h> inclusion
and build from elfutils.

Tested on Fedora 40 as well as macOS 14.4.1.

[1] https://sourceware.org/git/?p=elfutils.git;a=commit;h=a2194f6b305bf0d0b9dd49dccd0a5c21994c8eea

Fixes: #24030
Fixes: b6f025b ("tools/elfutils: update to 1.91")

Link: openwrt/openwrt#15337
Signed-off-by: Robert Marko <[email protected]>
  • Loading branch information
robimarko committed Apr 30, 2024
1 parent 47da178 commit 00ff73e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions tools/elfutils/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=elfutils
PKG_VERSION:=0.191
PKG_RELEASE:=1
PKG_RELEASE:=2

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION)
Expand Down Expand Up @@ -41,7 +41,6 @@ PKG_GNULIB_ARGS = \

PKG_GNULIB_MODS = \
argp \
dirname \
fts \
obstack \
progname \
Expand Down
10 changes: 5 additions & 5 deletions tools/elfutils/patches/100-portability.patch
Original file line number Diff line number Diff line change
Expand Up @@ -346,12 +346,11 @@
+}
--- a/libdwfl/libdwflP.h
+++ b/libdwfl/libdwflP.h
@@ -31,6 +31,8 @@
@@ -31,6 +31,7 @@

#include <libdwfl.h>
#include <libebl.h>
+#include <libeu.h>
+#include <dirname.h>
#include <assert.h>
#include <dirent.h>
#include <errno.h>
Expand All @@ -366,17 +365,18 @@
+#endif
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -32,8 +32,10 @@
@@ -32,10 +32,10 @@
#include <stdbool.h>
#include <pthread.h>

+#include <libeu.h>
#include <libdw.h>
#include <dwarf.h>
+#include <dirname.h>


-
/* Known location expressions already decoded. */
struct loc_s
{
--- a/libdw/Makefile.am
+++ b/libdw/Makefile.am
@@ -34,14 +34,12 @@ endif
Expand Down

0 comments on commit 00ff73e

Please sign in to comment.