tools/mklibs: revert r24282
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24283 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
97954f6e48
commit
abf928b1d8
|
@ -7,11 +7,11 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=mklibs
|
PKG_NAME:=mklibs
|
||||||
PKG_VERSION:=0.1.30
|
PKG_VERSION:=0.1.29
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/m/mklibs/
|
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
|
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/mklibs
|
||||||
|
|
||||||
|
@ -21,8 +21,8 @@ HOST_CFLAGS += -I$(CURDIR)/include
|
||||||
|
|
||||||
define Host/Install
|
define Host/Install
|
||||||
$(INSTALL_BIN) \
|
$(INSTALL_BIN) \
|
||||||
$(HOST_BUILD_DIR)/src/mklibs \
|
$(HOST_BUILD_DIR)/src/mklibs.py \
|
||||||
$(HOST_BUILD_DIR)/src/mklibs-copy \
|
$(HOST_BUILD_DIR)/src/mklibs-copy.py \
|
||||||
$(HOST_BUILD_DIR)/src/mklibs-readelf/mklibs-readelf \
|
$(HOST_BUILD_DIR)/src/mklibs-readelf/mklibs-readelf \
|
||||||
$(STAGING_DIR_HOST)/bin/
|
$(STAGING_DIR_HOST)/bin/
|
||||||
endef
|
endef
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- a/src/mklibs
|
--- a/src/mklibs.py
|
||||||
+++ b/src/mklibs
|
+++ b/src/mklibs.py
|
||||||
@@ -500,7 +500,7 @@ while 1:
|
@@ -500,7 +500,7 @@ while 1:
|
||||||
# No progress in last pass. Verify all remaining symbols are weak.
|
# No progress in last pass. Verify all remaining symbols are weak.
|
||||||
for name in unresolved:
|
for name in unresolved:
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- a/src/mklibs
|
--- a/src/mklibs.py
|
||||||
+++ b/src/mklibs
|
+++ b/src/mklibs.py
|
||||||
@@ -440,7 +440,7 @@ while 1:
|
@@ -440,7 +440,7 @@ while 1:
|
||||||
passnr = passnr + 1
|
passnr = passnr + 1
|
||||||
# Gather all already reduced libraries and treat them as objects as well
|
# Gather all already reduced libraries and treat them as objects as well
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- a/src/mklibs
|
--- a/src/mklibs.py
|
||||||
+++ b/src/mklibs
|
+++ b/src/mklibs.py
|
||||||
@@ -105,14 +105,14 @@ def library_depends(obj):
|
@@ -105,14 +105,14 @@ def library_depends(obj):
|
||||||
|
|
||||||
# Return a list of libraries the passed objects depend on. The
|
# Return a list of libraries the passed objects depend on. The
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- a/src/mklibs
|
--- a/src/mklibs.py
|
||||||
+++ b/src/mklibs
|
+++ b/src/mklibs.py
|
||||||
@@ -507,7 +507,6 @@ while 1:
|
@@ -507,7 +507,6 @@ while 1:
|
||||||
|
|
||||||
library_symbols = {}
|
library_symbols = {}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- a/src/mklibs
|
--- a/src/mklibs.py
|
||||||
+++ b/src/mklibs
|
+++ b/src/mklibs.py
|
||||||
@@ -571,6 +571,11 @@ while 1:
|
@@ -571,6 +571,11 @@ while 1:
|
||||||
extra_post_obj.append(sysroot + libc_extras_dir + "/sofini.o")
|
extra_post_obj.append(sysroot + libc_extras_dir + "/sofini.o")
|
||||||
symbols.add(ProvidedSymbol('__dso_handle', None, None, True))
|
symbols.add(ProvidedSymbol('__dso_handle', None, None, True))
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- a/src/mklibs
|
--- a/src/mklibs.py
|
||||||
+++ b/src/mklibs
|
+++ b/src/mklibs.py
|
||||||
@@ -583,7 +583,7 @@ while 1:
|
@@ -583,7 +583,7 @@ while 1:
|
||||||
# compile in only used symbols
|
# compile in only used symbols
|
||||||
cmd = []
|
cmd = []
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--- a/src/mklibs
|
--- a/src/mklibs.py
|
||||||
+++ b/src/mklibs
|
+++ b/src/mklibs.py
|
||||||
@@ -560,6 +560,7 @@ while 1:
|
@@ -560,6 +560,7 @@ while 1:
|
||||||
extra_flags = []
|
extra_flags = []
|
||||||
extra_pre_obj = []
|
extra_pre_obj = []
|
||||||
|
|
Loading…
Reference in New Issue