aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mklibs/patches/004-libpthread_link.patch
diff options
context:
space:
mode:
authorJames <>2015-11-04 11:49:21 +0000
committerJames <>2015-11-04 11:49:21 +0000
commit716ca530e1c4515d8683c9d5be3d56b301758b66 (patch)
tree700eb5bcc1a462a5f21dcec15ce7c97ecfefa772 /tools/mklibs/patches/004-libpthread_link.patch
downloadtrunk-47381-716ca530e1c4515d8683c9d5be3d56b301758b66.tar.gz
trunk-47381-716ca530e1c4515d8683c9d5be3d56b301758b66.tar.bz2
trunk-47381-716ca530e1c4515d8683c9d5be3d56b301758b66.zip
trunk-47381HEADmaster
Diffstat (limited to 'tools/mklibs/patches/004-libpthread_link.patch')
-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 0000000..657e232
--- /dev/null
+++ b/tools/mklibs/patches/004-libpthread_link.patch
@@ -0,0 +1,28 @@
+--- a/src/mklibs
++++ b/src/mklibs
+@@ -106,14 +106,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 Exception("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'):
+@@ -619,7 +619,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