From f5d6e088f84dd05278c4698a21cbf1ff4569978d Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 22 Oct 2024 15:03:42 +0200 Subject: [PATCH] libelf: Add libeu objects to libelf.a static archive libelf might use some symbols from libeu.a, specifically the eu-search wrappers. But we don't ship libeu.a separately. So include the libeu objects in the libelf.a archive to facilitate static linking. * libelf/Makefile.am (libeu_objects): New variable. (libelf_a_LIBADD): New, add libeu_objects. https://sourceware.org/bugzilla/show_bug.cgi?id=32293 Signed-off-by: Mark Wielaard Signed-off-by: Martin Jansa Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=f5d6e088f84dd05278c4698a21cbf1ff4569978d] --- libelf/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libelf/Makefile.am b/libelf/Makefile.am index 05484c1..72f1e22 100644 --- a/libelf/Makefile.am +++ b/libelf/Makefile.am @@ -125,6 +125,9 @@ libelf.so: $(srcdir)/libelf.map $(libelf_so_LIBS) $(libelf_so_DEPS) libeu_objects = $(shell cat ../lib/libeu.manifest) libelf_a_LIBADD = $(addprefix ../lib/,$(libeu_objects)) +libeu_objects = $(shell $(AR) t ../lib/libeu.a) +libelf_a_LIBADD = $(addprefix ../lib/,$(libeu_objects)) + install: install-am libelf.so $(mkinstalldirs) $(DESTDIR)$(libdir) $(INSTALL_PROGRAM) libelf.so $(DESTDIR)$(libdir)/libelf-$(PACKAGE_VERSION).so