tools/mklibs: revert r24282

SVN-Revision: 24283

diff --git a/tools/mklibs/Makefile b/tools/mklibs/Makefile
index 0c7fe0690b352b18a44a7eb6c08defdad71a0d7a..bd967217ead4998758163e11190500bf6af2c460 100644 (file)
--- 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 cdf21d05cb6bbe6c1b55ea3b054ef72183b1f57d..7ec63937c430309b9bc0c01fc59f2b1ccab28adb 100644 (file)
--- 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 28f3215172a8bab9cc26d2993d5241e7dff9e71d..bd6505aff996d9bd3c158ee2c1c00b780d039102 100644 (file)
--- 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 99aafaff671f16bc9c18a474414b0e23e667ff8c..b4a6e4f51321832b2b891023c4fdee62044da51a 100644 (file)
--- 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 4aa56b08bad7878794f5edd28c7d35c04d581e00..3f39ee5bb48cae0354d96c7df6a94465abe8e537 100644 (file)
--- 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 2334a37094d12c58f5119d922cad13de2cb02d0e..e76515085c4bb7d5efcd8cbeaa8a88e1084c1919 100644 (file)
--- 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 4de73f39f8ea1b53d61989dc2af43410167cc8fa..2775493b092b171ecd73f77bc6c985b7b76d7646 100644 (file)
--- 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 e36b1c14c64fd83eb6af6035338c6d41e5b9f2b8..2312d6a2c53c9777989c4c614c8ee95e8863df90 100644 (file)
--- 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 = []