X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=tools%2Fmklibs%2Fpatches%2F004-libpthread_link.patch;fp=tools%2Fmklibs%2Fpatches%2F004-libpthread_link.patch;h=657e232b0cba4a7d21f216db2a5f13df141bd9cf;hb=71a8b79240ea9c43573d52dd22ebe12e47d29c3d;hp=b4a6e4f51321832b2b891023c4fdee62044da51a;hpb=dd225c9d80e62871cbf0ec3964468b62b785da5e;p=openwrt.git diff --git a/tools/mklibs/patches/004-libpthread_link.patch b/tools/mklibs/patches/004-libpthread_link.patch index b4a6e4f513..657e232b0c 100644 --- a/tools/mklibs/patches/004-libpthread_link.patch +++ b/tools/mklibs/patches/004-libpthread_link.patch @@ -1,13 +1,13 @@ ---- a/src/mklibs.py -+++ b/src/mklibs.py -@@ -105,14 +105,14 @@ def library_depends(obj): +--- 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 "Cannot find lib: " + obj + raise Exception("Cannot find lib: " + obj) libs = library_depends(obj) ret = [] for i in libs: @@ -17,7 +17,7 @@ if match.group('ld'): ret.append(find_lib(match.group(0))) elif match.group('lib'): -@@ -592,7 +592,7 @@ while 1: +@@ -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 + "/")]])