From b724443f9f4c8d691fc0e7355e1388920cdb9b96 Mon Sep 17 00:00:00 2001 From: Luiz Angelo Daros de Luca Date: Sun, 17 Jun 2018 06:08:51 -0300 Subject: [PATCH] elfutils: bump to 0.173 - Removed hacks to use standalone argp as upstream now detects it nicely. - As we are already installing files, use files from PKG_INSTALL_DIR and not PKG_BUILD_DIR - Only changes Makefile.am as PKG_FIXUP:=autoreconf is in use Signed-off-by: Luiz Angelo Daros de Luca --- package/libs/elfutils/Makefile | 29 +- .../patches/002-argp_standalone.patch | 14 - .../elfutils/patches/003-libint-stub.patch | 26 +- .../patches/005-build_only_libs.patch | 12 - .../elfutils/patches/006-libdw_LIBS.patch | 11 - .../elfutils/patches/100-musl-compat.patch | 344 ++++++------------ .../libs/elfutils/patches/101-no-fts.patch | 64 +--- 7 files changed, 149 insertions(+), 351 deletions(-) delete mode 100644 package/libs/elfutils/patches/002-argp_standalone.patch delete mode 100644 package/libs/elfutils/patches/006-libdw_LIBS.patch diff --git a/package/libs/elfutils/Makefile b/package/libs/elfutils/Makefile index 07e1eb8157d6..830ccea3c69d 100644 --- a/package/libs/elfutils/Makefile +++ b/package/libs/elfutils/Makefile @@ -8,16 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=elfutils -PKG_VERSION:=0.169 +PKG_VERSION:=0.173 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION) -PKG_HASH:=9412fac7b30872b738bc1ed1ebcaed54493c26ef9a67887913498c17b10f3bc2 +PKG_HASH:=b76d8c133f68dad46250f5c223482c8299d454a69430d9aa5c19123345a000ff PKG_MAINTAINER:=Luiz Angelo Daros de Luca PKG_LICENSE:=GPL-3.0+ PKG_LICENSE_FILES:=COPYING COPYING-GPLV2 COPYING-LGPLV3 PKG_CPE_ID:=cpe:/a:elfutils_project:elfutils +PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_USE_MIPS16:=0 @@ -56,17 +57,9 @@ ifeq ($(CONFIG_BUILD_NLS),y) TARGET_LDFLAGS += "-lintl" endif -ifdef CONFIG_USE_UCLIBC -CONFIGURE_VARS += \ - LIBS="-largp" -endif - -ifdef CONFIG_USE_MUSL -CONFIGURE_VARS += \ - LIBS="-largp" -endif - CONFIGURE_ARGS += \ + --program-prefix=eu- \ + --disable-nls \ --without-lzma TARGET_CFLAGS += -D_GNU_SOURCE -Wno-unused-result -Wno-format-nonliteral @@ -75,24 +68,24 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libasm/libasm.{a,so*} $(1)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/libdw/libdw.{a,so*} $(1)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/libelf/libelf.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libasm.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdw.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.{a,so*} $(1)/usr/lib/ endef define Package/libasm/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libasm/libasm.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libasm.so* $(1)/usr/lib/ endef define Package/libdw/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libdw/libdw.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdw.so* $(1)/usr/lib/ endef define Package/libelf1/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libelf/libelf.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libasm)) diff --git a/package/libs/elfutils/patches/002-argp_standalone.patch b/package/libs/elfutils/patches/002-argp_standalone.patch deleted file mode 100644 index 8e2ca1bc0d7a..000000000000 --- a/package/libs/elfutils/patches/002-argp_standalone.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/lib/color.c -+++ b/lib/color.c -@@ -131,8 +131,10 @@ valid arguments are:\n\ - - 'never', 'no', 'none'\n\ - - 'auto', 'tty', 'if-tty'\n"), - program_invocation_short_name, arg); -+ char program_invocation_short_name_nonconst[sizeof(program_invocation_short_name)]; -+ strcpy(program_invocation_short_name_nonconst, program_invocation_short_name); - argp_help (&color_argp, stderr, ARGP_HELP_SEE, -- program_invocation_short_name); -+ program_invocation_short_name_nonconst); - exit (EXIT_FAILURE); - } - } diff --git a/package/libs/elfutils/patches/003-libint-stub.patch b/package/libs/elfutils/patches/003-libint-stub.patch index 2050bee64add..24cad74328fd 100644 --- a/package/libs/elfutils/patches/003-libint-stub.patch +++ b/package/libs/elfutils/patches/003-libint-stub.patch @@ -1,7 +1,5 @@ -Index: elfutils-0.169/libelf/libelfP.h -=================================================================== ---- elfutils-0.169.orig/libelf/libelfP.h -+++ elfutils-0.169/libelf/libelfP.h +--- a/libelf/libelfP.h ++++ b/libelf/libelfP.h @@ -39,6 +39,9 @@ #include #include @@ -12,11 +10,9 @@ Index: elfutils-0.169/libelf/libelfP.h /* gettext helper macros. */ #define _(Str) dgettext ("elfutils", Str) -Index: elfutils-0.169/libdw/libdwP.h -=================================================================== ---- elfutils-0.169.orig/libdw/libdwP.h -+++ elfutils-0.169/libdw/libdwP.h -@@ -36,7 +36,9 @@ +--- a/libdw/libdwP.h ++++ b/libdw/libdwP.h +@@ -35,7 +35,9 @@ #include #include @@ -27,10 +23,8 @@ Index: elfutils-0.169/libdw/libdwP.h /* gettext helper macros. */ #define _(Str) dgettext ("elfutils", Str) -Index: elfutils-0.169/libdwfl/libdwflP.h -=================================================================== ---- elfutils-0.169.orig/libdwfl/libdwflP.h -+++ elfutils-0.169/libdwfl/libdwflP.h +--- a/libdwfl/libdwflP.h ++++ b/libdwfl/libdwflP.h @@ -43,6 +43,9 @@ typedef struct Dwfl_Process Dwfl_Process; @@ -41,10 +35,8 @@ Index: elfutils-0.169/libdwfl/libdwflP.h /* gettext helper macros. */ #define _(Str) dgettext ("elfutils", Str) -Index: elfutils-0.169/libasm/libasmP.h -=================================================================== ---- elfutils-0.169.orig/libasm/libasmP.h -+++ elfutils-0.169/libasm/libasmP.h +--- a/libasm/libasmP.h ++++ b/libasm/libasmP.h @@ -35,6 +35,9 @@ #include "libdwelf.h" diff --git a/package/libs/elfutils/patches/005-build_only_libs.patch b/package/libs/elfutils/patches/005-build_only_libs.patch index 7c30efc9fd92..93d593a0fc68 100644 --- a/package/libs/elfutils/patches/005-build_only_libs.patch +++ b/package/libs/elfutils/patches/005-build_only_libs.patch @@ -1,15 +1,3 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -377,8 +377,7 @@ AM_MAKEFLAGS = --no-print-directory - pkginclude_HEADERS = version.h - - # Add doc back when we have some real content. --SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \ -- backends src po tests -+SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libasm - - EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ - COPYING COPYING-GPLV2 COPYING-LGPLV3 --- a/Makefile.am +++ b/Makefile.am @@ -27,8 +27,7 @@ AM_MAKEFLAGS = --no-print-directory diff --git a/package/libs/elfutils/patches/006-libdw_LIBS.patch b/package/libs/elfutils/patches/006-libdw_LIBS.patch deleted file mode 100644 index 59967e1488dc..000000000000 --- a/package/libs/elfutils/patches/006-libdw_LIBS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libdw/Makefile.in -+++ b/libdw/Makefile.in -@@ -1005,7 +1005,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map l - -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ - -Wl,--version-script,$<,--no-undefined \ - -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ -- -ldl -lz $(argp_LDADD) $(zip_LIBS) -+ -ldl -lz $(argp_LDADD) $(zip_LIBS) $(LIBS) - @$(textrel_check) - $(AM_V_at)ln -fs $@ $@.$(VERSION) - diff --git a/package/libs/elfutils/patches/100-musl-compat.patch b/package/libs/elfutils/patches/100-musl-compat.patch index cbced1101d00..249f251989d8 100644 --- a/package/libs/elfutils/patches/100-musl-compat.patch +++ b/package/libs/elfutils/patches/100-musl-compat.patch @@ -1,9 +1,7 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=21002 -Index: elfutils-0.169/lib/system.h -=================================================================== ---- elfutils-0.169.orig/lib/system.h -+++ elfutils-0.169/lib/system.h +--- a/lib/system.h ++++ b/lib/system.h @@ -29,7 +29,18 @@ #ifndef LIB_SYSTEM_H #define LIB_SYSTEM_H 1 @@ -34,10 +32,8 @@ Index: elfutils-0.169/lib/system.h #if __BYTE_ORDER == __LITTLE_ENDIAN # define LE32(n) (n) # define LE64(n) (n) -Index: elfutils-0.169/lib/color.c -=================================================================== ---- elfutils-0.169.orig/lib/color.c -+++ elfutils-0.169/lib/color.c +--- a/lib/color.c ++++ b/lib/color.c @@ -32,13 +32,13 @@ #endif @@ -53,10 +49,8 @@ Index: elfutils-0.169/lib/color.c /* Prototype for option handler. */ static error_t parse_opt (int key, char *arg, struct argp_state *state); -Index: elfutils-0.169/lib/xmalloc.c -=================================================================== ---- elfutils-0.169.orig/lib/xmalloc.c -+++ elfutils-0.169/lib/xmalloc.c +--- a/lib/xmalloc.c ++++ b/lib/xmalloc.c @@ -30,7 +30,6 @@ # include #endif @@ -65,10 +59,8 @@ Index: elfutils-0.169/lib/xmalloc.c #include #include #include -Index: elfutils-0.169/src/addr2line.c -=================================================================== ---- elfutils-0.169.orig/src/addr2line.c -+++ elfutils-0.169/src/addr2line.c +--- a/src/addr2line.c ++++ b/src/addr2line.c @@ -23,7 +23,6 @@ #include #include @@ -77,10 +69,8 @@ Index: elfutils-0.169/src/addr2line.c #include #include #include -Index: elfutils-0.169/src/ar.c -=================================================================== ---- elfutils-0.169.orig/src/ar.c -+++ elfutils-0.169/src/ar.c +--- a/src/ar.c ++++ b/src/ar.c @@ -22,7 +22,6 @@ #include @@ -89,10 +79,8 @@ Index: elfutils-0.169/src/ar.c #include #include #include -Index: elfutils-0.169/src/arlib2.c -=================================================================== ---- elfutils-0.169.orig/src/arlib2.c -+++ elfutils-0.169/src/arlib2.c +--- a/src/arlib2.c ++++ b/src/arlib2.c @@ -20,7 +20,6 @@ # include #endif @@ -101,10 +89,8 @@ Index: elfutils-0.169/src/arlib2.c #include #include #include -Index: elfutils-0.169/src/arlib.c -=================================================================== ---- elfutils-0.169.orig/src/arlib.c -+++ elfutils-0.169/src/arlib.c +--- a/src/arlib.c ++++ b/src/arlib.c @@ -21,7 +21,6 @@ #endif @@ -113,10 +99,8 @@ Index: elfutils-0.169/src/arlib.c #include #include #include -Index: elfutils-0.169/src/elfcmp.c -=================================================================== ---- elfutils-0.169.orig/src/elfcmp.c -+++ elfutils-0.169/src/elfcmp.c +--- a/src/elfcmp.c ++++ b/src/elfcmp.c @@ -23,7 +23,6 @@ #include #include @@ -125,10 +109,8 @@ Index: elfutils-0.169/src/elfcmp.c #include #include #include -Index: elfutils-0.169/src/elflint.c -=================================================================== ---- elfutils-0.169.orig/src/elflint.c -+++ elfutils-0.169/src/elflint.c +--- a/src/elflint.c ++++ b/src/elflint.c @@ -24,7 +24,6 @@ #include #include @@ -137,10 +119,8 @@ Index: elfutils-0.169/src/elflint.c #include #include #include -Index: elfutils-0.169/src/findtextrel.c -=================================================================== ---- elfutils-0.169.orig/src/findtextrel.c -+++ elfutils-0.169/src/findtextrel.c +--- a/src/findtextrel.c ++++ b/src/findtextrel.c @@ -23,7 +23,6 @@ #include #include @@ -149,10 +129,8 @@ Index: elfutils-0.169/src/findtextrel.c #include #include #include -Index: elfutils-0.169/src/nm.c -=================================================================== ---- elfutils-0.169.orig/src/nm.c -+++ elfutils-0.169/src/nm.c +--- a/src/nm.c ++++ b/src/nm.c @@ -26,7 +26,6 @@ #include #include @@ -161,10 +139,8 @@ Index: elfutils-0.169/src/nm.c #include #include #include -Index: elfutils-0.169/src/objdump.c -=================================================================== ---- elfutils-0.169.orig/src/objdump.c -+++ elfutils-0.169/src/objdump.c +--- a/src/objdump.c ++++ b/src/objdump.c @@ -21,7 +21,6 @@ #endif @@ -173,10 +149,8 @@ Index: elfutils-0.169/src/objdump.c #include #include #include -Index: elfutils-0.169/src/ranlib.c -=================================================================== ---- elfutils-0.169.orig/src/ranlib.c -+++ elfutils-0.169/src/ranlib.c +--- a/src/ranlib.c ++++ b/src/ranlib.c @@ -24,7 +24,6 @@ #include #include @@ -185,11 +159,9 @@ Index: elfutils-0.169/src/ranlib.c #include #include #include -Index: elfutils-0.169/src/readelf.c -=================================================================== ---- elfutils-0.169.orig/src/readelf.c -+++ elfutils-0.169/src/readelf.c -@@ -25,7 +25,6 @@ +--- a/src/readelf.c ++++ b/src/readelf.c +@@ -24,7 +24,6 @@ #include #include #include @@ -197,10 +169,8 @@ Index: elfutils-0.169/src/readelf.c #include #include #include -Index: elfutils-0.169/src/size.c -=================================================================== ---- elfutils-0.169.orig/src/size.c -+++ elfutils-0.169/src/size.c +--- a/src/size.c ++++ b/src/size.c @@ -21,7 +21,6 @@ #endif @@ -209,10 +179,8 @@ Index: elfutils-0.169/src/size.c #include #include #include -Index: elfutils-0.169/src/stack.c -=================================================================== ---- elfutils-0.169.orig/src/stack.c -+++ elfutils-0.169/src/stack.c +--- a/src/stack.c ++++ b/src/stack.c @@ -18,7 +18,6 @@ #include #include @@ -221,10 +189,8 @@ Index: elfutils-0.169/src/stack.c #include #include #include -Index: elfutils-0.169/src/strings.c -=================================================================== ---- elfutils-0.169.orig/src/strings.c -+++ elfutils-0.169/src/strings.c +--- a/src/strings.c ++++ b/src/strings.c @@ -25,7 +25,6 @@ #include #include @@ -233,22 +199,18 @@ Index: elfutils-0.169/src/strings.c #include #include #include -Index: elfutils-0.169/src/strip.c -=================================================================== ---- elfutils-0.169.orig/src/strip.c -+++ elfutils-0.169/src/strip.c +--- a/src/strip.c ++++ b/src/strip.c @@ -24,7 +24,6 @@ #include #include #include -#include #include + #include #include - #include -Index: elfutils-0.169/src/unstrip.c -=================================================================== ---- elfutils-0.169.orig/src/unstrip.c -+++ elfutils-0.169/src/unstrip.c +--- a/src/unstrip.c ++++ b/src/unstrip.c @@ -31,7 +31,6 @@ #include #include @@ -257,10 +219,8 @@ Index: elfutils-0.169/src/unstrip.c #include #include #include -Index: elfutils-0.169/tests/addrscopes.c -=================================================================== ---- elfutils-0.169.orig/tests/addrscopes.c -+++ elfutils-0.169/tests/addrscopes.c +--- a/tests/addrscopes.c ++++ b/tests/addrscopes.c @@ -25,7 +25,6 @@ #include #include @@ -269,10 +229,8 @@ Index: elfutils-0.169/tests/addrscopes.c #include -Index: elfutils-0.169/tests/allregs.c -=================================================================== ---- elfutils-0.169.orig/tests/allregs.c -+++ elfutils-0.169/tests/allregs.c +--- a/tests/allregs.c ++++ b/tests/allregs.c @@ -21,7 +21,6 @@ #include #include @@ -281,10 +239,8 @@ Index: elfutils-0.169/tests/allregs.c #include #include #include -Index: elfutils-0.169/tests/backtrace.c -=================================================================== ---- elfutils-0.169.orig/tests/backtrace.c -+++ elfutils-0.169/tests/backtrace.c +--- a/tests/backtrace.c ++++ b/tests/backtrace.c @@ -24,7 +24,6 @@ #include #include @@ -293,10 +249,8 @@ Index: elfutils-0.169/tests/backtrace.c #include #include #ifdef __linux__ -Index: elfutils-0.169/tests/backtrace-data.c -=================================================================== ---- elfutils-0.169.orig/tests/backtrace-data.c -+++ elfutils-0.169/tests/backtrace-data.c +--- a/tests/backtrace-data.c ++++ b/tests/backtrace-data.c @@ -27,7 +27,6 @@ #include #include @@ -305,10 +259,8 @@ Index: elfutils-0.169/tests/backtrace-data.c #include #include #if defined(__x86_64__) && defined(__linux__) -Index: elfutils-0.169/tests/buildid.c -=================================================================== ---- elfutils-0.169.orig/tests/buildid.c -+++ elfutils-0.169/tests/buildid.c +--- a/tests/buildid.c ++++ b/tests/buildid.c @@ -23,7 +23,6 @@ #include ELFUTILS_HEADER(elf) #include ELFUTILS_HEADER(dwelf) @@ -317,10 +269,8 @@ Index: elfutils-0.169/tests/buildid.c #include #include #include -Index: elfutils-0.169/tests/debugaltlink.c -=================================================================== ---- elfutils-0.169.orig/tests/debugaltlink.c -+++ elfutils-0.169/tests/debugaltlink.c +--- a/tests/debugaltlink.c ++++ b/tests/debugaltlink.c @@ -23,7 +23,6 @@ #include ELFUTILS_HEADER(dw) #include ELFUTILS_HEADER(dwelf) @@ -329,10 +279,8 @@ Index: elfutils-0.169/tests/debugaltlink.c #include #include #include -Index: elfutils-0.169/tests/debuglink.c -=================================================================== ---- elfutils-0.169.orig/tests/debuglink.c -+++ elfutils-0.169/tests/debuglink.c +--- a/tests/debuglink.c ++++ b/tests/debuglink.c @@ -21,7 +21,6 @@ #include #include ELFUTILS_HEADER(dwelf) @@ -341,10 +289,8 @@ Index: elfutils-0.169/tests/debuglink.c #include #include #include -Index: elfutils-0.169/tests/dwfl-addr-sect.c -=================================================================== ---- elfutils-0.169.orig/tests/dwfl-addr-sect.c -+++ elfutils-0.169/tests/dwfl-addr-sect.c +--- a/tests/dwfl-addr-sect.c ++++ b/tests/dwfl-addr-sect.c @@ -23,7 +23,6 @@ #include #include @@ -353,10 +299,8 @@ Index: elfutils-0.169/tests/dwfl-addr-sect.c #include #include #include ELFUTILS_HEADER(dwfl) -Index: elfutils-0.169/tests/dwfl-bug-addr-overflow.c -=================================================================== ---- elfutils-0.169.orig/tests/dwfl-bug-addr-overflow.c -+++ elfutils-0.169/tests/dwfl-bug-addr-overflow.c +--- a/tests/dwfl-bug-addr-overflow.c ++++ b/tests/dwfl-bug-addr-overflow.c @@ -20,7 +20,6 @@ #include #include @@ -365,10 +309,8 @@ Index: elfutils-0.169/tests/dwfl-bug-addr-overflow.c #include #include ELFUTILS_HEADER(dwfl) -Index: elfutils-0.169/tests/dwfl-bug-fd-leak.c -=================================================================== ---- elfutils-0.169.orig/tests/dwfl-bug-fd-leak.c -+++ elfutils-0.169/tests/dwfl-bug-fd-leak.c +--- a/tests/dwfl-bug-fd-leak.c ++++ b/tests/dwfl-bug-fd-leak.c @@ -24,7 +24,6 @@ #include #include @@ -377,10 +319,8 @@ Index: elfutils-0.169/tests/dwfl-bug-fd-leak.c #include #include -Index: elfutils-0.169/tests/dwfl-bug-getmodules.c -=================================================================== ---- elfutils-0.169.orig/tests/dwfl-bug-getmodules.c -+++ elfutils-0.169/tests/dwfl-bug-getmodules.c +--- a/tests/dwfl-bug-getmodules.c ++++ b/tests/dwfl-bug-getmodules.c @@ -18,7 +18,6 @@ #include #include ELFUTILS_HEADER(dwfl) @@ -389,10 +329,8 @@ Index: elfutils-0.169/tests/dwfl-bug-getmodules.c static const Dwfl_Callbacks callbacks = { -Index: elfutils-0.169/tests/dwfllines.c -=================================================================== ---- elfutils-0.169.orig/tests/dwfllines.c -+++ elfutils-0.169/tests/dwfllines.c +--- a/tests/dwfllines.c ++++ b/tests/dwfllines.c @@ -27,7 +27,6 @@ #include #include @@ -401,10 +339,8 @@ Index: elfutils-0.169/tests/dwfllines.c int main (int argc, char *argv[]) -Index: elfutils-0.169/tests/dwflmodtest.c -=================================================================== ---- elfutils-0.169.orig/tests/dwflmodtest.c -+++ elfutils-0.169/tests/dwflmodtest.c +--- a/tests/dwflmodtest.c ++++ b/tests/dwflmodtest.c @@ -23,7 +23,6 @@ #include #include @@ -413,10 +349,8 @@ Index: elfutils-0.169/tests/dwflmodtest.c #include #include #include ELFUTILS_HEADER(dwfl) -Index: elfutils-0.169/tests/dwfl-report-elf-align.c -=================================================================== ---- elfutils-0.169.orig/tests/dwfl-report-elf-align.c -+++ elfutils-0.169/tests/dwfl-report-elf-align.c +--- a/tests/dwfl-report-elf-align.c ++++ b/tests/dwfl-report-elf-align.c @@ -20,7 +20,6 @@ #include #include @@ -425,10 +359,8 @@ Index: elfutils-0.169/tests/dwfl-report-elf-align.c #include #include #include -Index: elfutils-0.169/tests/dwflsyms.c -=================================================================== ---- elfutils-0.169.orig/tests/dwflsyms.c -+++ elfutils-0.169/tests/dwflsyms.c +--- a/tests/dwflsyms.c ++++ b/tests/dwflsyms.c @@ -25,7 +25,6 @@ #include #include @@ -437,10 +369,8 @@ Index: elfutils-0.169/tests/dwflsyms.c #include static const char * -Index: elfutils-0.169/tests/early-offscn.c -=================================================================== ---- elfutils-0.169.orig/tests/early-offscn.c -+++ elfutils-0.169/tests/early-offscn.c +--- a/tests/early-offscn.c ++++ b/tests/early-offscn.c @@ -19,7 +19,6 @@ #endif @@ -449,10 +379,8 @@ Index: elfutils-0.169/tests/early-offscn.c #include #include #include -Index: elfutils-0.169/tests/ecp.c -=================================================================== ---- elfutils-0.169.orig/tests/ecp.c -+++ elfutils-0.169/tests/ecp.c +--- a/tests/ecp.c ++++ b/tests/ecp.c @@ -20,7 +20,6 @@ #endif @@ -461,10 +389,8 @@ Index: elfutils-0.169/tests/ecp.c #include #include #include -Index: elfutils-0.169/tests/find-prologues.c -=================================================================== ---- elfutils-0.169.orig/tests/find-prologues.c -+++ elfutils-0.169/tests/find-prologues.c +--- a/tests/find-prologues.c ++++ b/tests/find-prologues.c @@ -25,7 +25,6 @@ #include #include @@ -473,10 +399,8 @@ Index: elfutils-0.169/tests/find-prologues.c #include #include -Index: elfutils-0.169/tests/funcretval.c -=================================================================== ---- elfutils-0.169.orig/tests/funcretval.c -+++ elfutils-0.169/tests/funcretval.c +--- a/tests/funcretval.c ++++ b/tests/funcretval.c @@ -25,7 +25,6 @@ #include #include @@ -485,10 +409,8 @@ Index: elfutils-0.169/tests/funcretval.c #include #include -Index: elfutils-0.169/tests/funcscopes.c -=================================================================== ---- elfutils-0.169.orig/tests/funcscopes.c -+++ elfutils-0.169/tests/funcscopes.c +--- a/tests/funcscopes.c ++++ b/tests/funcscopes.c @@ -25,7 +25,6 @@ #include #include @@ -497,10 +419,8 @@ Index: elfutils-0.169/tests/funcscopes.c #include #include -Index: elfutils-0.169/tests/line2addr.c -=================================================================== ---- elfutils-0.169.orig/tests/line2addr.c -+++ elfutils-0.169/tests/line2addr.c +--- a/tests/line2addr.c ++++ b/tests/line2addr.c @@ -26,7 +26,6 @@ #include #include @@ -509,10 +429,8 @@ Index: elfutils-0.169/tests/line2addr.c static void -Index: elfutils-0.169/tests/low_high_pc.c -=================================================================== ---- elfutils-0.169.orig/tests/low_high_pc.c -+++ elfutils-0.169/tests/low_high_pc.c +--- a/tests/low_high_pc.c ++++ b/tests/low_high_pc.c @@ -25,7 +25,6 @@ #include #include @@ -521,22 +439,8 @@ Index: elfutils-0.169/tests/low_high_pc.c #include #include -Index: elfutils-0.169/tests/md5-sha1-test.c -=================================================================== ---- elfutils-0.169.orig/tests/md5-sha1-test.c -+++ elfutils-0.169/tests/md5-sha1-test.c -@@ -19,7 +19,6 @@ - #endif - - #include --#include - - #include "md5.h" - #include "sha1.h" -Index: elfutils-0.169/tests/rdwrmmap.c -=================================================================== ---- elfutils-0.169.orig/tests/rdwrmmap.c -+++ elfutils-0.169/tests/rdwrmmap.c +--- a/tests/rdwrmmap.c ++++ b/tests/rdwrmmap.c @@ -19,7 +19,6 @@ #endif @@ -545,10 +449,8 @@ Index: elfutils-0.169/tests/rdwrmmap.c #include #include #include -Index: elfutils-0.169/tests/saridx.c -=================================================================== ---- elfutils-0.169.orig/tests/saridx.c -+++ elfutils-0.169/tests/saridx.c +--- a/tests/saridx.c ++++ b/tests/saridx.c @@ -17,7 +17,6 @@ #include @@ -557,10 +459,8 @@ Index: elfutils-0.169/tests/saridx.c #include #include #include -Index: elfutils-0.169/tests/sectiondump.c -=================================================================== ---- elfutils-0.169.orig/tests/sectiondump.c -+++ elfutils-0.169/tests/sectiondump.c +--- a/tests/sectiondump.c ++++ b/tests/sectiondump.c @@ -18,7 +18,6 @@ #include @@ -569,10 +469,8 @@ Index: elfutils-0.169/tests/sectiondump.c #include #include #include -Index: elfutils-0.169/tests/varlocs.c -=================================================================== ---- elfutils-0.169.orig/tests/varlocs.c -+++ elfutils-0.169/tests/varlocs.c +--- a/tests/varlocs.c ++++ b/tests/varlocs.c @@ -25,7 +25,6 @@ #include #include @@ -581,10 +479,8 @@ Index: elfutils-0.169/tests/varlocs.c #include #include #include -Index: elfutils-0.169/libasm/asm_end.c -=================================================================== ---- elfutils-0.169.orig/libasm/asm_end.c -+++ elfutils-0.169/libasm/asm_end.c +--- a/libasm/asm_end.c ++++ b/libasm/asm_end.c @@ -32,7 +32,6 @@ #endif @@ -593,10 +489,8 @@ Index: elfutils-0.169/libasm/asm_end.c #include #include #include -Index: elfutils-0.169/libasm/asm_newscn.c -=================================================================== ---- elfutils-0.169.orig/libasm/asm_newscn.c -+++ elfutils-0.169/libasm/asm_newscn.c +--- a/libasm/asm_newscn.c ++++ b/libasm/asm_newscn.c @@ -32,7 +32,6 @@ #endif @@ -605,10 +499,8 @@ Index: elfutils-0.169/libasm/asm_newscn.c #include #include #include -Index: elfutils-0.169/libcpu/i386_gendis.c -=================================================================== ---- elfutils-0.169.orig/libcpu/i386_gendis.c -+++ elfutils-0.169/libcpu/i386_gendis.c +--- a/libcpu/i386_gendis.c ++++ b/libcpu/i386_gendis.c @@ -31,7 +31,6 @@ # include #endif @@ -617,11 +509,9 @@ Index: elfutils-0.169/libcpu/i386_gendis.c #include #include #include -Index: elfutils-0.169/libcpu/i386_lex.c -=================================================================== ---- elfutils-0.169.orig/libcpu/i386_lex.c -+++ elfutils-0.169/libcpu/i386_lex.c -@@ -592,7 +592,6 @@ char *i386_text; +--- a/libcpu/i386_lex.c ++++ b/libcpu/i386_lex.c +@@ -808,7 +808,6 @@ char *yytext; #endif #include @@ -629,10 +519,8 @@ Index: elfutils-0.169/libcpu/i386_lex.c #include #include -Index: elfutils-0.169/libcpu/i386_lex.l -=================================================================== ---- elfutils-0.169.orig/libcpu/i386_lex.l -+++ elfutils-0.169/libcpu/i386_lex.l +--- a/libcpu/i386_lex.l ++++ b/libcpu/i386_lex.l @@ -31,7 +31,6 @@ #endif @@ -641,10 +529,8 @@ Index: elfutils-0.169/libcpu/i386_lex.l #include #include -Index: elfutils-0.169/libcpu/i386_parse.c -=================================================================== ---- elfutils-0.169.orig/libcpu/i386_parse.c -+++ elfutils-0.169/libcpu/i386_parse.c +--- a/libcpu/i386_parse.c ++++ b/libcpu/i386_parse.c @@ -107,7 +107,6 @@ #include #include @@ -653,10 +539,8 @@ Index: elfutils-0.169/libcpu/i386_parse.c #include #include #include -Index: elfutils-0.169/libdw/libdw_alloc.c -=================================================================== ---- elfutils-0.169.orig/libdw/libdw_alloc.c -+++ elfutils-0.169/libdw/libdw_alloc.c +--- a/libdw/libdw_alloc.c ++++ b/libdw/libdw_alloc.c @@ -31,7 +31,6 @@ # include #endif @@ -665,17 +549,15 @@ Index: elfutils-0.169/libdw/libdw_alloc.c #include #include #include "libdwP.h" -@@ -74,5 +73,5 @@ __attribute ((noreturn, visibility ("hid +@@ -74,5 +73,5 @@ __attribute ((noreturn)) attribute_hidde __libdw_oom (void) { while (1) - error (EXIT_FAILURE, ENOMEM, "libdw"); + error (EXIT_FAILURE, errno, gettext ("cannot allocate memory")); } -Index: elfutils-0.169/libebl/eblopenbackend.c -=================================================================== ---- elfutils-0.169.orig/libebl/eblopenbackend.c -+++ elfutils-0.169/libebl/eblopenbackend.c +--- a/libebl/eblopenbackend.c ++++ b/libebl/eblopenbackend.c @@ -32,7 +32,6 @@ #include @@ -684,10 +566,8 @@ Index: elfutils-0.169/libebl/eblopenbackend.c #include #include #include -Index: elfutils-0.169/libdwfl/dwfl_error.c -=================================================================== ---- elfutils-0.169.orig/libdwfl/dwfl_error.c -+++ elfutils-0.169/libdwfl/dwfl_error.c +--- a/libdwfl/dwfl_error.c ++++ b/libdwfl/dwfl_error.c @@ -140,6 +140,7 @@ __libdwfl_seterrno (Dwfl_Error error) const char * dwfl_errmsg (int error) diff --git a/package/libs/elfutils/patches/101-no-fts.patch b/package/libs/elfutils/patches/101-no-fts.patch index 63699fea26fb..a6e192f8ffe1 100644 --- a/package/libs/elfutils/patches/101-no-fts.patch +++ b/package/libs/elfutils/patches/101-no-fts.patch @@ -1,7 +1,5 @@ -Index: elfutils-0.169/libdwfl/argp-std.c -=================================================================== ---- elfutils-0.169.orig/libdwfl/argp-std.c -+++ elfutils-0.169/libdwfl/argp-std.c +--- a/libdwfl/argp-std.c ++++ b/libdwfl/argp-std.c @@ -56,9 +56,6 @@ static const struct argp_option options[ { "linux-process-map", 'M', "FILE", 0, N_("Find addresses in files mapped as read from FILE" @@ -28,7 +26,7 @@ Index: elfutils-0.169/libdwfl/argp-std.c /* Structure held at state->HOOK. */ struct parse_opt { -@@ -223,43 +211,6 @@ parse_opt (int key, char *arg, struct ar +@@ -226,43 +214,6 @@ parse_opt (int key, char *arg, struct ar } break; @@ -40,11 +38,11 @@ Index: elfutils-0.169/libdwfl/argp-std.c - Dwfl *dwfl = INTUSE(dwfl_begin) (&kernel_callbacks); - int result = INTUSE(dwfl_linux_kernel_report_kernel) (dwfl); - if (result != 0) -- return fail (dwfl, result, _("cannot load kernel symbols")); +- return fail (dwfl, result, _("cannot load kernel symbols"), state); - result = INTUSE(dwfl_linux_kernel_report_modules) (dwfl); - if (result != 0) - /* Non-fatal to have no modules since we do have the kernel. */ -- failure (dwfl, result, _("cannot find kernel modules")); +- argp_failure (state, 0, result, _("cannot find kernel modules")); - opt->dwfl = dwfl; - } - else @@ -61,7 +59,7 @@ Index: elfutils-0.169/libdwfl/argp-std.c - int result = INTUSE(dwfl_linux_kernel_report_offline) (dwfl, arg, - NULL); - if (result != 0) -- return fail (dwfl, result, _("cannot find kernel or modules")); +- return fail (dwfl, result, _("cannot find kernel or modules"), state); - opt->dwfl = dwfl; - } - else @@ -72,42 +70,14 @@ Index: elfutils-0.169/libdwfl/argp-std.c case ARGP_KEY_SUCCESS: { struct parse_opt *opt = state->hook; -Index: elfutils-0.169/libdwfl/Makefile.in -=================================================================== ---- elfutils-0.169.orig/libdwfl/Makefile.in -+++ elfutils-0.169/libdwfl/Makefile.in -@@ -120,7 +120,7 @@ am__libdwfl_a_SOURCES_DIST = dwfl_begin. - dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \ - dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \ - find-debuginfo.c dwfl_build_id_find_elf.c \ -- dwfl_build_id_find_debuginfo.c linux-kernel-modules.c \ -+ dwfl_build_id_find_debuginfo.c \ - linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \ - dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \ - dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \ -@@ -148,7 +148,7 @@ am_libdwfl_a_OBJECTS = dwfl_begin.$(OBJE - dwfl_validate_address.$(OBJEXT) argp-std.$(OBJEXT) \ - find-debuginfo.$(OBJEXT) dwfl_build_id_find_elf.$(OBJEXT) \ - dwfl_build_id_find_debuginfo.$(OBJEXT) \ -- linux-kernel-modules.$(OBJEXT) linux-proc-maps.$(OBJEXT) \ -+ linux-proc-maps.$(OBJEXT) \ - dwfl_addrmodule.$(OBJEXT) dwfl_addrdwarf.$(OBJEXT) \ - cu.$(OBJEXT) dwfl_module_nextcu.$(OBJEXT) \ - dwfl_nextcu.$(OBJEXT) dwfl_cumodule.$(OBJEXT) \ -@@ -434,7 +434,7 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en - dwfl_getmodules.c dwfl_getdwarf.c dwfl_module_getdwarf.c \ - dwfl_module_getelf.c dwfl_validate_address.c argp-std.c \ - find-debuginfo.c dwfl_build_id_find_elf.c \ -- dwfl_build_id_find_debuginfo.c linux-kernel-modules.c \ -+ dwfl_build_id_find_debuginfo.c \ - linux-proc-maps.c dwfl_addrmodule.c dwfl_addrdwarf.c cu.c \ - dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \ - dwfl_module_addrdie.c dwfl_addrdie.c lines.c dwfl_lineinfo.c \ -@@ -571,7 +571,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lines.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link_map.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-core-attach.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-kernel-modules.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-pid-attach.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-proc-maps.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzma.Po@am__quote@ +--- a/libdwfl/Makefile.am ++++ b/libdwfl/Makefile.am +@@ -49,7 +49,7 @@ libdwfl_a_SOURCES = dwfl_begin.c dwfl_en + argp-std.c find-debuginfo.c \ + dwfl_build_id_find_elf.c \ + dwfl_build_id_find_debuginfo.c \ +- linux-kernel-modules.c linux-proc-maps.c \ ++ linux-proc-maps.c \ + dwfl_addrmodule.c dwfl_addrdwarf.c \ + cu.c dwfl_module_nextcu.c dwfl_nextcu.c dwfl_cumodule.c \ + dwfl_module_addrdie.c dwfl_addrdie.c \ -- 2.30.2