summaryrefslogtreecommitdiffstats
path: root/tools/mklibs/patches/008-uclibc_libgcc_link.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-10 15:09:09 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-10 15:09:09 +0000
commitfae644a63b578cd9a3dcee0d0c968757c964cf46 (patch)
tree12337ee3bf6ee4e284aae3638c2cd1cf17e0b5b7 /tools/mklibs/patches/008-uclibc_libgcc_link.patch
parentd0fc9333a91498555cd2e327f6ce47fd3dce9ac1 (diff)
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/008-uclibc_libgcc_link.patch')
-rw-r--r--tools/mklibs/patches/008-uclibc_libgcc_link.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/tools/mklibs/patches/008-uclibc_libgcc_link.patch b/tools/mklibs/patches/008-uclibc_libgcc_link.patch
deleted file mode 100644
index 648b8ef3f..000000000
--- a/tools/mklibs/patches/008-uclibc_libgcc_link.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/mklibs
-+++ b/src/mklibs
-@@ -113,11 +113,8 @@ def library_depends_gcc_libnames(obj, so
- ret = []
- for i in libs:
- match = re.match("^(((?P<ld>ld\S*)|(lib(?P<lib>\S+))))\.so.*$", i)
-- if match and not soname in ("libpthread.so.0"):
-- if match.group('ld'):
-- ret.append(find_lib(match.group(0)))
-- elif match.group('lib'):
-- ret.append('-l%s' % match.group('lib'))
-+ if match:
-+ ret.append(find_lib(match.group(0)))
- return ' '.join(ret)
-
- class Symbol(object):
-@@ -586,6 +583,7 @@ while 1:
- extra_flags = []
- extra_pre_obj = []
- extra_post_obj = []
-+ libgcc_link = find_lib("libgcc_s.so.1")
-
- symbols.update(library_symbols_used[library])
-
-@@ -616,9 +614,10 @@ while 1:
- cmd.append(pic_file)
- cmd.extend(extra_post_obj)
- cmd.extend(extra_flags)
-- cmd.append("-lgcc")
- cmd.extend(["-L%s" % a for a in [dest_path] + [sysroot + b for b in lib_path if sysroot == "" or b not in ("/" + libdir + "/", "/usr/" + libdir + "/")]])
-- cmd.append(library_depends_gcc_libnames(so_file, soname))
-+ if soname != "libgcc_s.so.1":
-+ cmd.append(library_depends_gcc_libnames(so_file, soname))
-+ cmd.append(libgcc_link)
- command(target + "gcc", *cmd)
-
- ## DEBUG