From 3f567d8452644dc5349addabbb8f0bff9d0bc2c0 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Wed, 25 Nov 2020 21:28:17 +0000 Subject: tools/sstrip: update to latest version Drop our local sstrip copy and use the current ELFKickers upstream version. Patch the original makefile in order to avoid building elftoc, since it fails with musl's elf.h. This is fine, since we only need sstrip anyway. Finally, add the possibility to pass additional arguments to sstrip and pass -z (remove trailing zeros) by default, which matches the behaviour of the previous version. Signed-off-by: Rui Salvaterra [shorten long commit msg lines] Signed-off-by: Paul Spooren --- .../patches/001-disable-elftoc-compilation.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 tools/sstrip/patches/001-disable-elftoc-compilation.patch (limited to 'tools/sstrip/patches/001-disable-elftoc-compilation.patch') diff --git a/tools/sstrip/patches/001-disable-elftoc-compilation.patch b/tools/sstrip/patches/001-disable-elftoc-compilation.patch new file mode 100644 index 0000000000..787c51ce5b --- /dev/null +++ b/tools/sstrip/patches/001-disable-elftoc-compilation.patch @@ -0,0 +1,28 @@ +From: Rui Salvaterra +Subject: sstrip: don't try to compile elftoc + +We only need sstrip itself and elftoc doesn't compile with musl's elf.h, so +disable the elftoc compilation in the makefile. + +Signed-off-by: Rui Salvaterra +--- + +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ + + prefix = /usr/local + +-PROGRAMS = elfls objres rebind sstrip elftoc ebfc infect ++PROGRAMS = elfls objres rebind sstrip ebfc infect + + all: $(PROGRAMS) + +@@ -19,7 +19,6 @@ elfls: bin/elfls doc/elfls.1 + objres: bin/objres doc/objres.1 + rebind: bin/rebind doc/rebind.1 + sstrip: bin/sstrip doc/sstrip.1 +-elftoc: bin/elftoc doc/elftoc.1 + ebfc: bin/ebfc doc/ebfc.1 + infect: bin/infect doc/infect.1 + -- cgit v1.2.3