aboutsummaryrefslogtreecommitdiffstats
path: root/tools/sstrip/patches
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2020-11-25 21:28:17 +0000
committerPaul Spooren <mail@aparcar.org>2020-11-26 12:44:25 -1000
commit3f567d8452644dc5349addabbb8f0bff9d0bc2c0 (patch)
tree2c79a050bbe2089e699c61f4bef093b522ed7ae2 /tools/sstrip/patches
parent6429307a3d6ba4c88d477cc7a3995be314e3dd15 (diff)
downloadupstream-3f567d8452644dc5349addabbb8f0bff9d0bc2c0.tar.gz
upstream-3f567d8452644dc5349addabbb8f0bff9d0bc2c0.tar.bz2
upstream-3f567d8452644dc5349addabbb8f0bff9d0bc2c0.zip
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 <rsalvaterra@gmail.com> [shorten long commit msg lines] Signed-off-by: Paul Spooren <mail@aparcar.org>
Diffstat (limited to 'tools/sstrip/patches')
-rw-r--r--tools/sstrip/patches/001-disable-elftoc-compilation.patch28
1 files changed, 28 insertions, 0 deletions
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 <rsalvaterra@gmail.com>
+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 <rsalvaterra@gmail.com>
+---
+
+--- 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
+