diff options
author | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-06 13:21:09 +0000 |
---|---|---|
committer | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-06 13:21:09 +0000 |
commit | 2ad1d18700611d6e81d4feb6ea36140c1e6f2fe4 (patch) | |
tree | 651136fbf9def14d70c9cfe3347b679cfa81a8c3 /tools/mklibs | |
parent | 75a80d1ea4a5dadc26cfce2eced96d2f39a767fb (diff) |
tools/mklibs: revert r24282
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24283 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mklibs')
-rw-r--r-- | tools/mklibs/Makefile | 8 | ||||
-rw-r--r-- | tools/mklibs/patches/002-disable_symbol_checks.patch | 4 | ||||
-rw-r--r-- | tools/mklibs/patches/003-no_copy.patch | 4 | ||||
-rw-r--r-- | tools/mklibs/patches/004-libpthread_link.patch | 4 | ||||
-rw-r--r-- | tools/mklibs/patches/006-duplicate_syms.patch | 4 | ||||
-rw-r--r-- | tools/mklibs/patches/007-uclibc_init.patch | 4 | ||||
-rw-r--r-- | tools/mklibs/patches/008-gc_sections.patch | 4 | ||||
-rw-r--r-- | tools/mklibs/patches/009-uclibc_libgcc_link.patch | 4 |
8 files changed, 18 insertions, 18 deletions
diff --git a/tools/mklibs/Makefile b/tools/mklibs/Makefile index 0c7fe0690b..bd967217ea 100644 --- a/tools/mklibs/Makefile +++ b/tools/mklibs/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mklibs -PKG_VERSION:=0.1.30 +PKG_VERSION:=0.1.29 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/m/mklibs/ -PKG_MD5SUM:=15d20c45f786126e31aa3ac06fc08da5 +PKG_MD5SUM:=7f35dfdbde249a090199829c1a1222d8 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/mklibs @@ -21,8 +21,8 @@ HOST_CFLAGS += -I$(CURDIR)/include define Host/Install $(INSTALL_BIN) \ - $(HOST_BUILD_DIR)/src/mklibs \ - $(HOST_BUILD_DIR)/src/mklibs-copy \ + $(HOST_BUILD_DIR)/src/mklibs.py \ + $(HOST_BUILD_DIR)/src/mklibs-copy.py \ $(HOST_BUILD_DIR)/src/mklibs-readelf/mklibs-readelf \ $(STAGING_DIR_HOST)/bin/ endef diff --git a/tools/mklibs/patches/002-disable_symbol_checks.patch b/tools/mklibs/patches/002-disable_symbol_checks.patch index cdf21d05cb..7ec63937c4 100644 --- a/tools/mklibs/patches/002-disable_symbol_checks.patch +++ b/tools/mklibs/patches/002-disable_symbol_checks.patch @@ -1,5 +1,5 @@ ---- a/src/mklibs -+++ b/src/mklibs +--- a/src/mklibs.py ++++ b/src/mklibs.py @@ -500,7 +500,7 @@ while 1: # No progress in last pass. Verify all remaining symbols are weak. for name in unresolved: diff --git a/tools/mklibs/patches/003-no_copy.patch b/tools/mklibs/patches/003-no_copy.patch index 28f3215172..bd6505aff9 100644 --- a/tools/mklibs/patches/003-no_copy.patch +++ b/tools/mklibs/patches/003-no_copy.patch @@ -1,5 +1,5 @@ ---- a/src/mklibs -+++ b/src/mklibs +--- a/src/mklibs.py ++++ b/src/mklibs.py @@ -440,7 +440,7 @@ while 1: passnr = passnr + 1 # Gather all already reduced libraries and treat them as objects as well diff --git a/tools/mklibs/patches/004-libpthread_link.patch b/tools/mklibs/patches/004-libpthread_link.patch index 99aafaff67..b4a6e4f513 100644 --- a/tools/mklibs/patches/004-libpthread_link.patch +++ b/tools/mklibs/patches/004-libpthread_link.patch @@ -1,5 +1,5 @@ ---- a/src/mklibs -+++ b/src/mklibs +--- 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 diff --git a/tools/mklibs/patches/006-duplicate_syms.patch b/tools/mklibs/patches/006-duplicate_syms.patch index 4aa56b08ba..3f39ee5bb4 100644 --- a/tools/mklibs/patches/006-duplicate_syms.patch +++ b/tools/mklibs/patches/006-duplicate_syms.patch @@ -1,5 +1,5 @@ ---- a/src/mklibs -+++ b/src/mklibs +--- a/src/mklibs.py ++++ b/src/mklibs.py @@ -507,7 +507,6 @@ while 1: library_symbols = {} diff --git a/tools/mklibs/patches/007-uclibc_init.patch b/tools/mklibs/patches/007-uclibc_init.patch index 2334a37094..e76515085c 100644 --- a/tools/mklibs/patches/007-uclibc_init.patch +++ b/tools/mklibs/patches/007-uclibc_init.patch @@ -1,5 +1,5 @@ ---- a/src/mklibs -+++ b/src/mklibs +--- a/src/mklibs.py ++++ b/src/mklibs.py @@ -571,6 +571,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/008-gc_sections.patch b/tools/mklibs/patches/008-gc_sections.patch index 4de73f39f8..2775493b09 100644 --- a/tools/mklibs/patches/008-gc_sections.patch +++ b/tools/mklibs/patches/008-gc_sections.patch @@ -1,5 +1,5 @@ ---- a/src/mklibs -+++ b/src/mklibs +--- a/src/mklibs.py ++++ b/src/mklibs.py @@ -583,7 +583,7 @@ while 1: # compile in only used symbols cmd = [] diff --git a/tools/mklibs/patches/009-uclibc_libgcc_link.patch b/tools/mklibs/patches/009-uclibc_libgcc_link.patch index e36b1c14c6..2312d6a2c5 100644 --- a/tools/mklibs/patches/009-uclibc_libgcc_link.patch +++ b/tools/mklibs/patches/009-uclibc_libgcc_link.patch @@ -1,5 +1,5 @@ ---- a/src/mklibs -+++ b/src/mklibs +--- a/src/mklibs.py ++++ b/src/mklibs.py @@ -560,6 +560,7 @@ while 1: extra_flags = [] extra_pre_obj = [] |