summaryrefslogtreecommitdiffstats
path: root/tools/mklibs/patches/002-disable_symbol_checks.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2012-06-10 17:07:46 +0000
committerLuka Perkov <luka@openwrt.org>2012-06-10 17:07:46 +0000
commit33dadd70ab731f48bac9e48bca73cd354a933db4 (patch)
treee4cb6ebfec69a580d108f6ad4e06a3aa4688004a /tools/mklibs/patches/002-disable_symbol_checks.patch
parentd8bea7da9ac837eb7d23183ad58614120dd7d903 (diff)
downloadmaster-31e0f0ae-33dadd70ab731f48bac9e48bca73cd354a933db4.tar.gz
master-31e0f0ae-33dadd70ab731f48bac9e48bca73cd354a933db4.tar.bz2
master-31e0f0ae-33dadd70ab731f48bac9e48bca73cd354a933db4.zip
mklibs: update to 0.1.34 (v2)
SVN-Revision: 32165
Diffstat (limited to 'tools/mklibs/patches/002-disable_symbol_checks.patch')
-rw-r--r--tools/mklibs/patches/002-disable_symbol_checks.patch23
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])
-