From 71a8b79240ea9c43573d52dd22ebe12e47d29c3d Mon Sep 17 00:00:00 2001 From: luka Date: Sat, 9 Jun 2012 21:22:37 +0000 Subject: [tools] mklibs: update to 0.1.34 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32145 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- tools/mklibs/patches/008-uclibc_libgcc_link.patch | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 tools/mklibs/patches/008-uclibc_libgcc_link.patch (limited to 'tools/mklibs/patches/008-uclibc_libgcc_link.patch') diff --git a/tools/mklibs/patches/008-uclibc_libgcc_link.patch b/tools/mklibs/patches/008-uclibc_libgcc_link.patch new file mode 100644 index 000000000..648b8ef3f --- /dev/null +++ b/tools/mklibs/patches/008-uclibc_libgcc_link.patch @@ -0,0 +1,37 @@ +--- 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("^(((?Pld\S*)|(lib(?P\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 -- cgit v1.2.3