diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2019-07-26 23:45:47 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2019-07-26 23:50:21 +0200 |
| commit | 9437012b9ee4dc550e42665b71902cf885169100 (patch) | |
| tree | 68243f401099be5e37fddbdf15ae745e267c8cb7 /tools/mklibs/patches/005-duplicate_syms.patch | |
| parent | 83d5ca2186f7801d94f336e09f8db0a2c5c5d97f (diff) | |
| download | upstream-9437012b9ee4dc550e42665b71902cf885169100.tar.gz upstream-9437012b9ee4dc550e42665b71902cf885169100.tar.bz2 upstream-9437012b9ee4dc550e42665b71902cf885169100.zip | |
tools/mklibs: update to 0.1.44 and convert to Python 3
Since the switch to Python 3 build fails if CONFIG_USE_MKLIBS is set
("Strip unnecessary functions from libraries" in menuconfig) as
mklibs hasn't been converted to run on Python 3.
* update to most recent upstream version which brings some
reproducibility fixes
* converted to Python 3 using 2to3
* fixed mixed tab/spaces indentation
* fixed use of string.* functions
* some more minor fixes to make Python 3 happy
Fixes commit 19938c8de7 ("build: switch to Python 3")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'tools/mklibs/patches/005-duplicate_syms.patch')
| -rw-r--r-- | tools/mklibs/patches/005-duplicate_syms.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/mklibs/patches/005-duplicate_syms.patch b/tools/mklibs/patches/005-duplicate_syms.patch index 8428abfc9a..b0fdab7b10 100644 --- a/tools/mklibs/patches/005-duplicate_syms.patch +++ b/tools/mklibs/patches/005-duplicate_syms.patch @@ -1,6 +1,6 @@ --- a/src/mklibs +++ b/src/mklibs -@@ -531,7 +531,6 @@ while 1: +@@ -540,7 +540,6 @@ while 1: library_symbols = {} library_symbols_used = {} @@ -8,7 +8,7 @@ # WORKAROUND: Always add libgcc on old-abi arm header = elf_header(find_lib(libraries.copy().pop())) -@@ -549,20 +548,13 @@ while 1: +@@ -558,20 +557,13 @@ while 1: library_symbols_used[library] = set() for symbol in symbols: for name in symbol.base_names(): @@ -32,4 +32,4 @@ + library_symbols_used[lib].add(library_symbols[lib][name]) # reduce libraries - for library in libraries: + for library in sorted(libraries): |