aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mklibs
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-09-20 12:51:48 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-09-20 12:51:48 +0000
commit76c655e96b94be7057a80ce8cd50b7fff1fcb4a5 (patch)
tree382cd715d0ecc03c3b52d7579d7474706bb62c48 /tools/mklibs
parentca300a2f07ab1af6c838493898cb1ac839244bae (diff)
downloadupstream-76c655e96b94be7057a80ce8cd50b7fff1fcb4a5.tar.gz
upstream-76c655e96b94be7057a80ce8cd50b7fff1fcb4a5.tar.bz2
upstream-76c655e96b94be7057a80ce8cd50b7fff1fcb4a5.zip
mklibs: fix libpthread link error (#5851)
SVN-Revision: 17639
Diffstat (limited to 'tools/mklibs')
-rw-r--r--tools/mklibs/patches/004-libpthread_link.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/tools/mklibs/patches/004-libpthread_link.patch b/tools/mklibs/patches/004-libpthread_link.patch
new file mode 100644
index 0000000000..b4a6e4f513
--- /dev/null
+++ b/tools/mklibs/patches/004-libpthread_link.patch
@@ -0,0 +1,28 @@
+--- a/src/mklibs.py
++++ b/src/mklibs.py
+@@ -105,14 +105,14 @@ def library_depends(obj):
+
+ # Return a list of libraries the passed objects depend on. The
+ # libraries are in "-lfoo" format suitable for passing to gcc.
+-def library_depends_gcc_libnames(obj):
++def library_depends_gcc_libnames(obj, soname):
+ if not os.access(obj, os.F_OK):
+ raise "Cannot find lib: " + obj
+ libs = library_depends(obj)
+ ret = []
+ for i in libs:
+ match = re.match("^(((?P<ld>ld\S*)|(lib(?P<lib>\S+))))\.so.*$", i)
+- if match:
++ if match and not soname in ("libpthread.so.0"):
+ if match.group('ld'):
+ ret.append(find_lib(match.group(0)))
+ elif match.group('lib'):
+@@ -592,7 +592,7 @@ while 1:
+ 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))
++ cmd.append(library_depends_gcc_libnames(so_file, soname))
+ command(target + "gcc", *cmd)
+
+ ## DEBUG