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/009-uclibc_libgcc_link.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/009-uclibc_libgcc_link.patch')
-rw-r--r-- | tools/mklibs/patches/009-uclibc_libgcc_link.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/tools/mklibs/patches/009-uclibc_libgcc_link.patch b/tools/mklibs/patches/009-uclibc_libgcc_link.patch new file mode 100644 index 0000000000..36f2067193 --- /dev/null +++ b/tools/mklibs/patches/009-uclibc_libgcc_link.patch @@ -0,0 +1,37 @@ +--- a/src/mklibs.py ++++ b/src/mklibs.py +@@ -112,11 +112,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): +@@ -560,6 +557,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]) + +@@ -590,9 +588,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 |