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 | 1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4 (patch) | |
| tree | ee5ebc2ee6dec8c0add30dfadd46b55f2312f9a9 /tools/mklibs/patches/004-libpthread_link.patch | |
| parent | e2be7290b1cd0e6061d7d0f982ac5da13ff1a685 (diff) | |
| download | upstream-1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4.tar.gz upstream-1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4.tar.bz2 upstream-1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4.zip | |
Revert "[tools] mklibs: update to 0.1.34"
Too much broken, needs to be reworked
SVN-Revision: 32163
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 657e232b0c..b4a6e4f513 100644 --- a/tools/mklibs/patches/004-libpthread_link.patch +++ b/tools/mklibs/patches/004-libpthread_link.patch @@ -1,13 +1,13 @@ ---- a/src/mklibs -+++ b/src/mklibs -@@ -106,14 +106,14 @@ def library_depends(obj): +--- 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 Exception("Cannot find lib: " + obj) + raise "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'): -@@ -619,7 +619,7 @@ while 1: +@@ -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 + "/")]]) |