From fae644a63b578cd9a3dcee0d0c968757c964cf46 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 10 Jun 2012 15:09:09 +0000 Subject: Revert "[tools] mklibs: update to 0.1.34" Too much broken, needs to be reworked git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32163 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- tools/mklibs/patches/004-libpthread_link.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/mklibs/patches/004-libpthread_link.patch') diff --git a/tools/mklibs/patches/004-libpthread_link.patch b/tools/mklibs/patches/004-libpthread_link.patch index 657e232b0..b4a6e4f51 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 + "/")]]) -- cgit v1.2.3