summaryrefslogtreecommitdiffstats
path: root/tools/mklibs/patches/002-disable_symbol_checks.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-06-10 15:09:09 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-06-10 15:09:09 +0000
commit1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4 (patch)
treeee5ebc2ee6dec8c0add30dfadd46b55f2312f9a9 /tools/mklibs/patches/002-disable_symbol_checks.patch
parente2be7290b1cd0e6061d7d0f982ac5da13ff1a685 (diff)
downloadmaster-31e0f0ae-1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4.tar.gz
master-31e0f0ae-1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4.tar.bz2
master-31e0f0ae-1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4.zip
Revert "[tools] mklibs: update to 0.1.34"
Too much broken, needs to be reworked SVN-Revision: 32163
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, 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])
+