diff --git a/backport-add-libeu.a-to-libelf.patch b/backport-add-libeu.a-to-libelf.patch new file mode 100644 index 0000000000000000000000000000000000000000..799cfb4a14de1168c44ce6a8b95d55a9f6555517 --- /dev/null +++ b/backport-add-libeu.a-to-libelf.patch @@ -0,0 +1,36 @@ +From 0a65a54593ae489d40cb993caa74095d45bc47fd 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 +--- + libelf/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libelf/Makefile.am b/libelf/Makefile.am +index 3402863e..2d3dbdf2 100644 +--- a/libelf/Makefile.am ++++ b/libelf/Makefile.am +@@ -122,6 +122,9 @@ libelf.so: $(srcdir)/libelf.map $(libelf_so_LIBS) $(libelf_so_DEPS) + @$(textrel_check) + $(AM_V_at)ln -fs $@ $@.$(VERSION) + ++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 +-- +2.47.0 + diff --git a/elfutils.spec b/elfutils.spec index c391286ffa34ba66622560090fd50c064c909921..ff5cb205665975a14dc5edb94a5b451d3899df96 100644 --- a/elfutils.spec +++ b/elfutils.spec @@ -1,6 +1,6 @@ Name: elfutils Version: 0.192 -Release: 1 +Release: 2 Summary: A collection of utilities and DSOs to handle ELF files and DWARF data URL: https://elfutils.org/ License: GPL-3.0-or-later AND (GPL-2.0-or-later OR LGPL-3.0-or-later) @@ -9,6 +9,8 @@ Source: https://sourceware.org/elfutils/ftp/%{version}/elfutils-%{version}.tar.b Patch0: Fix-segfault-in-eu-ar-m.patch Patch1: Fix-issue-of-moving-files-by-ar-or-br.patch +Patch6001: backport-add-libeu.a-to-libelf.patch + Requires: elfutils-libelf = %{version}-%{release} Requires: elfutils-libs = %{version}-%{release} Requires: glibc >= 2.7 libstdc++ @@ -300,6 +302,9 @@ exit 0 %systemd_postun_with_restart debuginfod.service %changelog +* Wed Oct 23 2024 Funda Wang - 0.192-2 +- backport libelf: Add libeu objects to libelf.a static archive + * Sun Oct 20 2024 Funda Wang - 0.192-1 - update to 0.192