projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools/mklibs: update to 0.1.44 and convert to Python 3
[openwrt/openwrt.git]
/
tools
/
mklibs
/
patches
/
005-duplicate_syms.patch
diff --git
a/tools/mklibs/patches/005-duplicate_syms.patch
b/tools/mklibs/patches/005-duplicate_syms.patch
index 8428abfc9a07d278f92fdee168e1cc88f162cbb3..b0fdab7b10ff979b1337aab976df4b31acb2d073 100644
(file)
--- 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
--- a/src/mklibs
+++ b/src/mklibs
-@@ -5
31,7 +531
,6 @@ while 1:
+@@ -5
40,7 +540
,6 @@ while 1:
library_symbols = {}
library_symbols_used = {}
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()))
# WORKAROUND: Always add libgcc on old-abi arm
header = elf_header(find_lib(libraries.copy().pop()))
-@@ -5
49,20 +548
,13 @@ while 1:
+@@ -5
58,20 +557
,13 @@ while 1:
library_symbols_used[library] = set()
for symbol in symbols:
for name in symbol.base_names():
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
+ library_symbols_used[lib].add(library_symbols[lib][name])
# reduce libraries
- for library in
libraries
:
+ for library in
sorted(libraries)
: