From e8268e3f93e275ca0e4a2717dbc7dd5b9f89caf4 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 5 Jun 2013 00:21:23 +0000 Subject: Revert "[tools] mklibs: upgrade to 0.1.37" It breaks on trying to find ldso git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36849 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- tools/mklibs/Makefile | 4 ++-- tools/mklibs/patches/002-disable_symbol_checks.patch | 4 ++-- tools/mklibs/patches/003-no_copy.patch | 6 +++--- tools/mklibs/patches/004-libpthread_link.patch | 4 ++-- tools/mklibs/patches/005-duplicate_syms.patch | 4 ++-- tools/mklibs/patches/006-uclibc_init.patch | 2 +- tools/mklibs/patches/007-gc_sections.patch | 2 +- tools/mklibs/patches/008-uclibc_libgcc_link.patch | 6 +++--- tools/mklibs/patches/009-uclibc_libpthread_symbols.patch | 8 ++++---- tools/mklibs/patches/010-remove_STT_GNU_IFUNC.patch | 4 ++-- tools/mklibs/patches/011-remove_multiarch.patch | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) (limited to 'tools') diff --git a/tools/mklibs/Makefile b/tools/mklibs/Makefile index 1f6ce27db5..fa0bce70d9 100644 --- a/tools/mklibs/Makefile +++ b/tools/mklibs/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mklibs -PKG_VERSION:=0.1.37 +PKG_VERSION:=0.1.35 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/m/mklibs/ -PKG_MD5SUM:=099cc99d51f09ea51e58a56e62a46af7 +PKG_MD5SUM:=3d2a4bd0bbf5ba964b0a1ecdafd1ea9a HOST_FIXUP:=autoreconf diff --git a/tools/mklibs/patches/002-disable_symbol_checks.patch b/tools/mklibs/patches/002-disable_symbol_checks.patch index 4c0a362b36..44be637609 100644 --- a/tools/mklibs/patches/002-disable_symbol_checks.patch +++ b/tools/mklibs/patches/002-disable_symbol_checks.patch @@ -1,6 +1,6 @@ --- a/src/mklibs +++ b/src/mklibs -@@ -522,7 +522,7 @@ +@@ -524,7 +524,7 @@ while 1: # No progress in last pass. Verify all remaining symbols are weak. for name in unresolved: if not needed_symbols[name].weak: @@ -9,7 +9,7 @@ break previous_pass_unresolved = unresolved -@@ -557,7 +557,7 @@ +@@ -559,7 +559,7 @@ while 1: for name in needed_symbols: if not name in symbol_provider: if not needed_symbols[name].weak: diff --git a/tools/mklibs/patches/003-no_copy.patch b/tools/mklibs/patches/003-no_copy.patch index ba40570a03..e0ab2ac88d 100644 --- a/tools/mklibs/patches/003-no_copy.patch +++ b/tools/mklibs/patches/003-no_copy.patch @@ -1,6 +1,6 @@ --- a/src/mklibs +++ b/src/mklibs -@@ -461,7 +461,7 @@ +@@ -463,7 +463,7 @@ while 1: passnr = passnr + 1 # Gather all already reduced libraries and treat them as objects as well small_libs = [] @@ -9,7 +9,7 @@ obj = dest_path + "/" + lib small_libs.append(obj) inode = os.stat(obj)[ST_INO] -@@ -577,12 +577,7 @@ +@@ -579,12 +579,7 @@ while 1: if not so_file: sys.exit("File not found:" + library) pic_file = find_pic(library) @@ -23,7 +23,7 @@ # we have a pic file, recompile debug(DEBUG_SPAM, "extracting from:", pic_file, "so_file:", so_file) soname = extract_soname(so_file) -@@ -625,22 +620,14 @@ +@@ -627,22 +622,14 @@ while 1: cmd.append(library_depends_gcc_libnames(so_file)) command(target + "gcc", *cmd) diff --git a/tools/mklibs/patches/004-libpthread_link.patch b/tools/mklibs/patches/004-libpthread_link.patch index ccf1340783..657e232b0c 100644 --- a/tools/mklibs/patches/004-libpthread_link.patch +++ b/tools/mklibs/patches/004-libpthread_link.patch @@ -1,6 +1,6 @@ --- a/src/mklibs +++ b/src/mklibs -@@ -106,14 +106,14 @@ +@@ -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. @@ -17,7 +17,7 @@ if match.group('ld'): ret.append(find_lib(match.group(0))) elif match.group('lib'): -@@ -617,7 +617,7 @@ +@@ -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 + "/")]]) diff --git a/tools/mklibs/patches/005-duplicate_syms.patch b/tools/mklibs/patches/005-duplicate_syms.patch index 19ba0171d0..8428abfc9a 100644 --- a/tools/mklibs/patches/005-duplicate_syms.patch +++ b/tools/mklibs/patches/005-duplicate_syms.patch @@ -1,6 +1,6 @@ --- a/src/mklibs +++ b/src/mklibs -@@ -529,7 +529,6 @@ +@@ -531,7 +531,6 @@ while 1: library_symbols = {} library_symbols_used = {} @@ -8,7 +8,7 @@ # WORKAROUND: Always add libgcc on old-abi arm header = elf_header(find_lib(libraries.copy().pop())) -@@ -547,20 +546,13 @@ +@@ -549,20 +548,13 @@ while 1: library_symbols_used[library] = set() for symbol in symbols: for name in symbol.base_names(): diff --git a/tools/mklibs/patches/006-uclibc_init.patch b/tools/mklibs/patches/006-uclibc_init.patch index 8a07e33609..2df7fe4355 100644 --- a/tools/mklibs/patches/006-uclibc_init.patch +++ b/tools/mklibs/patches/006-uclibc_init.patch @@ -1,6 +1,6 @@ --- a/src/mklibs +++ b/src/mklibs -@@ -593,6 +593,11 @@ +@@ -595,6 +595,11 @@ while 1: extra_post_obj.append(sysroot + libc_extras_dir + "/sofini.o") symbols.add(ProvidedSymbol('__dso_handle', None, None, True)) diff --git a/tools/mklibs/patches/007-gc_sections.patch b/tools/mklibs/patches/007-gc_sections.patch index 0d47a1df09..068d88a532 100644 --- a/tools/mklibs/patches/007-gc_sections.patch +++ b/tools/mklibs/patches/007-gc_sections.patch @@ -1,6 +1,6 @@ --- a/src/mklibs +++ b/src/mklibs -@@ -605,7 +605,7 @@ +@@ -607,7 +607,7 @@ while 1: # compile in only used symbols cmd = [] cmd.extend(gcc_options) diff --git a/tools/mklibs/patches/008-uclibc_libgcc_link.patch b/tools/mklibs/patches/008-uclibc_libgcc_link.patch index 7172b4ca5d..432a313b6c 100644 --- a/tools/mklibs/patches/008-uclibc_libgcc_link.patch +++ b/tools/mklibs/patches/008-uclibc_libgcc_link.patch @@ -1,6 +1,6 @@ --- a/src/mklibs +++ b/src/mklibs -@@ -113,11 +113,8 @@ +@@ -113,11 +113,8 @@ def library_depends_gcc_libnames(obj, so ret = [] for i in libs: match = re.match("^(((?Pld\S*)|(lib(?P\S+))))\.so.*$", i) @@ -14,7 +14,7 @@ return ' '.join(ret) class Symbol(object): -@@ -582,6 +579,7 @@ +@@ -584,6 +581,7 @@ while 1: extra_flags = [] extra_pre_obj = [] extra_post_obj = [] @@ -22,7 +22,7 @@ symbols.update(library_symbols_used[library]) -@@ -612,9 +610,10 @@ +@@ -614,9 +612,10 @@ while 1: cmd.append(pic_file) cmd.extend(extra_post_obj) cmd.extend(extra_flags) diff --git a/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch b/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch index ec679267a2..34866f7290 100644 --- a/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch +++ b/tools/mklibs/patches/009-uclibc_libpthread_symbols.patch @@ -1,6 +1,6 @@ --- a/src/mklibs +++ b/src/mklibs -@@ -162,9 +162,10 @@ +@@ -162,9 +162,10 @@ def undefined_symbols(obj): return result class ProvidedSymbol(Symbol): @@ -12,7 +12,7 @@ def base_names(self): ret = [] -@@ -205,11 +206,15 @@ +@@ -205,11 +206,15 @@ def provided_symbols(obj): if version_string.lower() not in ('base', 'none'): version = version_string @@ -29,7 +29,7 @@ return result -@@ -498,6 +503,9 @@ +@@ -500,6 +505,9 @@ while 1: debug(DEBUG_SPAM, "present_symbols adding %s" % symbol) names = symbol.base_names() for name in names: @@ -39,7 +39,7 @@ present_symbols[name] = symbol # are we finished? -@@ -589,12 +597,16 @@ +@@ -591,12 +599,16 @@ while 1: # may segfault in ptmalloc_init due to undefined weak reference extra_pre_obj.append(sysroot + libc_extras_dir + "/soinit.o") extra_post_obj.append(sysroot + libc_extras_dir + "/sofini.o") diff --git a/tools/mklibs/patches/010-remove_STT_GNU_IFUNC.patch b/tools/mklibs/patches/010-remove_STT_GNU_IFUNC.patch index 6d3555816e..6bae8c7ce5 100644 --- a/tools/mklibs/patches/010-remove_STT_GNU_IFUNC.patch +++ b/tools/mklibs/patches/010-remove_STT_GNU_IFUNC.patch @@ -1,6 +1,6 @@ --- a/src/mklibs-readelf/main.cpp +++ b/src/mklibs-readelf/main.cpp -@@ -84,7 +84,7 @@ +@@ -84,7 +84,7 @@ static void process_symbols_provided (co continue; if (shndx == SHN_UNDEF || shndx == SHN_ABS) continue; @@ -9,7 +9,7 @@ continue; if (!name.size()) continue; -@@ -115,7 +115,7 @@ +@@ -115,7 +115,7 @@ static void process_symbols_undefined (c continue; if (shndx != SHN_UNDEF) continue; diff --git a/tools/mklibs/patches/011-remove_multiarch.patch b/tools/mklibs/patches/011-remove_multiarch.patch index 9f0bdd11e6..a32d8ee17a 100644 --- a/tools/mklibs/patches/011-remove_multiarch.patch +++ b/tools/mklibs/patches/011-remove_multiarch.patch @@ -1,6 +1,6 @@ --- a/src/mklibs +++ b/src/mklibs -@@ -263,6 +263,7 @@ +@@ -263,6 +263,7 @@ def extract_soname(so_file): return "" def multiarch(paths): -- cgit v1.2.3