diff options
author | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-06-10 17:07:46 +0000 |
---|---|---|
committer | luka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-06-10 17:07:46 +0000 |
commit | 3060881070cec7e44f64aab8b61c15d6d117ca5f (patch) | |
tree | 748a052f3a88a3494e1ec1d97312b26cc393aec1 /tools/mklibs/patches/002-disable_symbol_checks.patch | |
parent | 3d48f3f57b5e98ed485c7e8b99e49d485a06bca9 (diff) |
[tools] mklibs: update to 0.1.34 (v2)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32165 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mklibs/patches/002-disable_symbol_checks.patch')
-rw-r--r-- | tools/mklibs/patches/002-disable_symbol_checks.patch | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/tools/mklibs/patches/002-disable_symbol_checks.patch b/tools/mklibs/patches/002-disable_symbol_checks.patch index 7ec63937c4..44be637609 100644 --- a/tools/mklibs/patches/002-disable_symbol_checks.patch +++ b/tools/mklibs/patches/002-disable_symbol_checks.patch @@ -1,23 +1,20 @@ ---- a/src/mklibs.py -+++ b/src/mklibs.py -@@ -500,7 +500,7 @@ while 1: +--- a/src/mklibs ++++ b/src/mklibs +@@ -524,7 +524,7 @@ while 1: # No progress in last pass. Verify all remaining symbols are weak. for name in unresolved: if not needed_symbols[name].weak: -- raise "Unresolvable symbol %s" % name +- raise Exception("Unresolvable symbol %s" % name) + print "WARNING: Unresolvable symbol %s" % name break previous_pass_unresolved = unresolved -@@ -533,10 +533,7 @@ while 1: - - # which symbols are actually used from each lib +@@ -559,7 +559,7 @@ while 1: for name in needed_symbols: -- if not name in symbol_provider: -- if not needed_symbols[name].weak: -- raise "No library provides non-weak %s" % name -- else: -+ if name in symbol_provider: + if not name in symbol_provider: + if not needed_symbols[name].weak: +- raise Exception("No library provides non-weak %s" % name) ++ print "WARNING: Unresolvable symbol %s" % name + else: lib = symbol_provider[name] library_symbols_used[lib].add(library_symbols[lib][name]) - |