diff options
| author | Luka Perkov <luka@openwrt.org> | 2012-06-10 17:07:46 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2012-06-10 17:07:46 +0000 |
| commit | 33dadd70ab731f48bac9e48bca73cd354a933db4 (patch) | |
| tree | e4cb6ebfec69a580d108f6ad4e06a3aa4688004a /tools/mklibs/patches/004-libpthread_link.patch | |
| parent | d8bea7da9ac837eb7d23183ad58614120dd7d903 (diff) | |
| download | master-31e0f0ae-33dadd70ab731f48bac9e48bca73cd354a933db4.tar.gz master-31e0f0ae-33dadd70ab731f48bac9e48bca73cd354a933db4.tar.bz2 master-31e0f0ae-33dadd70ab731f48bac9e48bca73cd354a933db4.zip | |
mklibs: update to 0.1.34 (v2)
SVN-Revision: 32165
Diffstat (limited to 'tools/mklibs/patches/004-libpthread_link.patch')
| -rw-r--r-- | tools/mklibs/patches/004-libpthread_link.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 + "/")]]) |