diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-06-10 15:09:09 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-06-10 15:09:09 +0000 |
commit | 28cf4e273d19888305c77e1ac51bd9e06d09e0ac (patch) | |
tree | 12337ee3bf6ee4e284aae3638c2cd1cf17e0b5b7 /tools/mklibs/patches/002-disable_symbol_checks.patch | |
parent | 7bdb966d209dc8cc1f2dbf773dc5036e0c2256b3 (diff) | |
download | master-187ad058-28cf4e273d19888305c77e1ac51bd9e06d09e0ac.tar.gz master-187ad058-28cf4e273d19888305c77e1ac51bd9e06d09e0ac.tar.bz2 master-187ad058-28cf4e273d19888305c77e1ac51bd9e06d09e0ac.zip |
Revert "[tools] mklibs: update to 0.1.34"
Too much broken, needs to be reworked
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32163 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, 13 insertions, 10 deletions
diff --git a/tools/mklibs/patches/002-disable_symbol_checks.patch b/tools/mklibs/patches/002-disable_symbol_checks.patch index 44be637609..7ec63937c4 100644 --- a/tools/mklibs/patches/002-disable_symbol_checks.patch +++ b/tools/mklibs/patches/002-disable_symbol_checks.patch @@ -1,20 +1,23 @@ ---- a/src/mklibs -+++ b/src/mklibs -@@ -524,7 +524,7 @@ while 1: +--- a/src/mklibs.py ++++ b/src/mklibs.py +@@ -500,7 +500,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 Exception("Unresolvable symbol %s" % name) +- raise "Unresolvable symbol %s" % name + print "WARNING: Unresolvable symbol %s" % name break previous_pass_unresolved = unresolved -@@ -559,7 +559,7 @@ while 1: +@@ -533,10 +533,7 @@ while 1: + + # which symbols are actually used from each lib for name in needed_symbols: - 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: +- 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: lib = symbol_provider[name] library_symbols_used[lib].add(library_symbols[lib][name]) + |