tools: remove static linking support

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 44285

diff --git a/tools/bison/Makefile b/tools/bison/Makefile
index bf7b92b2c12442ec9a64124299fa2b5ba8a47c47..10d872048415262f5df12361f843c3a75f9fccd4 100644 (file)
--- a/tools/bison/Makefile
+++ b/tools/bison/Makefile
@@ -18,8 +18,6 @@ HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_LDFLAGS += $(HOST_STATIC_LINKING)
-
 define Host/Clean
        -$(MAKE) -C $(HOST_BUILD_DIR) uninstall
        $(call Host/Clean/Default)

diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile
index aeac393051f4090203c228a368ee278171b98b4d..d91bee19efc4398089eeb690d0901c9905a454e8 100644 (file)
--- a/tools/ccache/Makefile
+++ b/tools/ccache/Makefile
@@ -16,7 +16,6 @@ PKG_MD5SUM:=522a6016bda56892653612bbdefff3e0
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_LDFLAGS += $(HOST_STATIC_LINKING)
 HOST_CONFIGURE_VARS += CC="$(HOSTCC_NOCACHE)"
 
 define Host/Install/ccache

diff --git a/tools/dosfstools/Makefile b/tools/dosfstools/Makefile
index f91d1b101535345caa0fc51880a32ec7ab34cac8..ca4f284aa6c2401c036b5080aefc53a23888ce28 100644 (file)
--- a/tools/dosfstools/Makefile
+++ b/tools/dosfstools/Makefile
@@ -16,7 +16,7 @@ PKG_MD5SUM:=45012f5f56f2aae3afcd62120b9e5a08
 include $(INCLUDE_DIR)/host-build.mk
 
 define Host/Compile
-       $(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)"
+       $(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" LDFLAGS="$(HOST_LDFLAGS)"
 endef
 
 define Host/Install

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index 60047c763ab859b6021c24d9bc95e78b2a572b66..5632e1949d30aecd8a3fd0501c5e6e3684207986 100644 (file)
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -20,7 +20,6 @@ HOST_BUILD_PARALLEL:=1
 include $(INCLUDE_DIR)/host-build.mk
 
 HOST_CFLAGS += $(FPIC)
-HOST_LDFLAGS += $(HOST_STATIC_LINKING)
 
 HOST_CONFIGURE_ARGS += \
        --disable-shared \

diff --git a/tools/elftosb/Makefile b/tools/elftosb/Makefile
index 6f9b963975e35e567dff889fa9375eb7c9f063f6..5adafef7369cf93ef6648a9389d842c73654535b 100644 (file)
--- a/tools/elftosb/Makefile
+++ b/tools/elftosb/Makefile
@@ -16,7 +16,7 @@ PKG_MD5SUM:=e8005d606c1e0bb3507c82f6eceb3056
 include $(INCLUDE_DIR)/host-build.mk
 
 define Host/Compile
-       $(MAKE) -C $(HOST_BUILD_DIR) LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)"
+       $(MAKE) -C $(HOST_BUILD_DIR) LDFLAGS="$(HOST_LDFLAGS)"
 endef
 
 define Host/Install

diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index 83c51d7d906449084cfa2167144d6c5f628e8c11..c18024a302f443506ccb6c6f4f8c857992dc70fd 100644 (file)
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 define cc
-       $(HOSTCC) $(HOST_CFLAGS) -include endian.h $(HOST_STATIC_LINKING) $(HOST_LDFLAGS) -o $(HOST_BUILD_DIR)/bin/$(firstword $(1)) $(foreach src,$(1),src/$(src).c) $(2)
+       $(HOSTCC) $(HOST_CFLAGS) -include endian.h $(HOST_LDFLAGS) -o $(HOST_BUILD_DIR)/bin/$(firstword $(1)) $(foreach src,$(1),src/$(src).c) $(2)
 endef
 
 define Host/Compile

diff --git a/tools/flex/Makefile b/tools/flex/Makefile
index 90082df43e013afbe10de792303779ec6534a10f..0e56edea50db6cba56295b155f320ba4cab0d972 100644 (file)
--- a/tools/flex/Makefile
+++ b/tools/flex/Makefile
@@ -19,7 +19,6 @@ HOST_BUILD_PARALLEL:=1
 include $(INCLUDE_DIR)/host-build.mk
 
 HOST_CONFIGURE_ARGS += --disable-shared
-HOST_LDFLAGS += $(HOST_STATIC_LINKING)
 
 define Host/Clean
        -$(MAKE) -C $(HOST_BUILD_DIR) uninstall

diff --git a/tools/flock/Makefile b/tools/flock/Makefile
index f5e13cd9117add9c51de27bcca7ae048a9a15958..a6a4758f0524f84a74540bade072756759652076 100644 (file)
--- a/tools/flock/Makefile
+++ b/tools/flock/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/host-build.mk
 
 define Host/Compile
        mkdir -p $(HOST_BUILD_DIR)
-       $(HOSTCC) $(HOST_CFLAGS) $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/flock src/flock.c
+       $(HOSTCC) $(HOST_CFLAGS) -o $(HOST_BUILD_DIR)/flock src/flock.c
 endef
 
 define Host/Install

diff --git a/tools/genext2fs/Makefile b/tools/genext2fs/Makefile
index 57e8d35b51995c1470dca0735ec9d0276c5f485b..ad941c71ac4369e9344a305b5c1b1329533170c0 100644 (file)
--- a/tools/genext2fs/Makefile
+++ b/tools/genext2fs/Makefile
@@ -36,7 +36,7 @@ HOST_CONFIGURE_ARGS = \
 define Host/Compile
        $(MAKE) -C $(HOST_BUILD_DIR) \
                CFLAGS="$(HOST_CFLAGS)" \
-               LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" \
+               LDFLAGS="$(HOST_LDFLAGS)" \
                all
 endef
 

diff --git a/tools/lzma/Makefile b/tools/lzma/Makefile
index 6e01051a3a4d093a26e1de4623431e78fe951094..4922f8087f63ad456608f952084f8c63290b8308 100644 (file)
--- a/tools/lzma/Makefile
+++ b/tools/lzma/Makefile
@@ -21,8 +21,8 @@ UTIL_DIR=$(HOST_BUILD_DIR)/C/LzmaUtil
 ALONE_DIR=$(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone
 
 define Host/Compile
-       $(MAKE) -C $(UTIL_DIR) -f makefile.gcc LDFLAGS="$(HOST_STATIC_LINKING)"
-       $(MAKE) -C $(ALONE_DIR) -f makefile.gcc LDFLAGS="$(HOST_STATIC_LINKING)"
+       $(MAKE) -C $(UTIL_DIR) -f makefile.gcc
+       $(MAKE) -C $(ALONE_DIR) -f makefile.gcc
 endef
 
 define Host/Install

diff --git a/tools/m4/Makefile b/tools/m4/Makefile
index 71498b490a15d129897c4f2e0a548ca5daf72e4b..47c332123be4e2cd1a0f8c2c54ff85b8ec183050 100644 (file)
--- a/tools/m4/Makefile
+++ b/tools/m4/Makefile
@@ -20,8 +20,6 @@ include $(INCLUDE_DIR)/host-build.mk
 
 HOST_CONFIGURE_VARS += gl_cv_func_strstr_linear=no
 
-HOST_LDFLAGS += $(HOST_STATIC_LINKING)
-
 define Host/Clean
        -$(MAKE) -C $(HOST_BUILD_DIR) uninstall
        $(call Host/Clean/Default)

diff --git a/tools/mkimage/Makefile b/tools/mkimage/Makefile
index 2de13ab77b1456ec057913b282cbde24e0523789..a65eedfcc64d30ae78785f526ed6b7d10eb9a845 100644 (file)
--- a/tools/mkimage/Makefile
+++ b/tools/mkimage/Makefile
@@ -32,9 +32,7 @@ endef
 
 define Host/Compile
        $(MAKE) -C $(HOST_BUILD_DIR) defconfig
-       $(MAKE) -C $(HOST_BUILD_DIR) \
-               HOSTLDFLAGS="$(HOST_STATIC_LINKING)" \
-               tools-only
+       $(MAKE) -C $(HOST_BUILD_DIR) tools-only
 endef
 
 define Host/Install

diff --git a/tools/mklibs/Makefile b/tools/mklibs/Makefile
index fa0bce70d9bd509aa31a0a17a556e161b2bd9536..6bf1431b8c3d417b7f8dba3928a41873ad9d5b43 100644 (file)
--- a/tools/mklibs/Makefile
+++ b/tools/mklibs/Makefile
@@ -18,7 +18,6 @@ HOST_FIXUP:=autoreconf
 include $(INCLUDE_DIR)/host-build.mk
 
 HOST_CFLAGS += -I$(CURDIR)/include
-HOST_LDFLAGS += $(HOST_STATIC_LINKING)
 
 define Host/Install
        $(INSTALL_BIN) \

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index cc857d9e00ffed708ae6e39091632b842addd2ce..aa0919a7b905bb9d0b5407b70ddcae2ecf5eada9 100644 (file)
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -29,7 +29,7 @@ endif
 
 MTD_MAKEOPTS = \
        CFLAGS="$(CFLAGS)" \
-       LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" \
+       LDFLAGS="$(HOST_LDFLAGS)" \
        WITHOUT_LZO=1 WITHOUT_XATTR=1 \
        LZMA_STATIC_LIB="$(STAGING_DIR_HOST)/lib/liblzma.a" \
        SUBDIRS="" \

diff --git a/tools/mtools/Makefile b/tools/mtools/Makefile
index 3bbc1a41a7a8c28e6f574596cfb59066061dc185..674c8dd2cccfe3afa90b566aacd0357576c63372 100644 (file)
--- a/tools/mtools/Makefile
+++ b/tools/mtools/Makefile
@@ -21,8 +21,6 @@ include $(INCLUDE_DIR)/host-build.mk
 HOST_CONFIGURE_VARS += \
        ac_cv_header_iconv_h=no
 
-HOST_LDFLAGS += $(HOST_STATIC_LINKING)
-
 define Host/Compile
        $(MAKE) -C $(HOST_BUILD_DIR) mcopy
 endef

diff --git a/tools/padjffs2/Makefile b/tools/padjffs2/Makefile
index 4535735d69ef24695a2a5821cb1c7aeee93788f1..0a583b8e1a82402dc99cdb4281b057c5b4916d00 100644 (file)
--- a/tools/padjffs2/Makefile
+++ b/tools/padjffs2/Makefile
@@ -19,7 +19,7 @@ define Host/Prepare
 endef
 
 define Host/Compile
-       $(MAKE) -C $(HOST_BUILD_DIR) LDFLAGS="$(HOST_STATIC_LINKING)"
+       $(MAKE) -C $(HOST_BUILD_DIR)
 endef
 
 define Host/Configure

diff --git a/tools/patch-image/Makefile b/tools/patch-image/Makefile
index cd2df5c8af3dd01bb7d229b1cfae6097135d21ce..6f2900b96ce06e9cc46125c4304a820a04a4d540 100644 (file)
--- a/tools/patch-image/Makefile
+++ b/tools/patch-image/Makefile
@@ -11,8 +11,8 @@ PKG_NAME:=patch-image
 include $(INCLUDE_DIR)/host-build.mk
 
 define Host/Compile
-       $(HOSTCC) $(HOST_CFLAGS) -include endian.h $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/patch-cmdline src/patch-cmdline.c
-       $(HOSTCC) $(HOST_CFLAGS) -include endian.h $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/patch-dtb src/patch-dtb.c
+       $(HOSTCC) $(HOST_CFLAGS) -include endian.h -o $(HOST_BUILD_DIR)/patch-cmdline src/patch-cmdline.c
+       $(HOSTCC) $(HOST_CFLAGS) -include endian.h -o $(HOST_BUILD_DIR)/patch-dtb src/patch-dtb.c
 endef
 
 define Host/Install

diff --git a/tools/pkg-config/Makefile b/tools/pkg-config/Makefile
index 0edc807e9da74310b384af23d815872e8371168c..9a1b3fb9869775c31996ac828f90ec4c2d6fc467 100644 (file)
--- a/tools/pkg-config/Makefile
+++ b/tools/pkg-config/Makefile
@@ -17,14 +17,12 @@ HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_LDFLAGS += $(HOST_STATIC_LINKING)
 unexport PKG_CONFIG
 
 HOST_CONFIGURE_ARGS += --with-internal-glib
 
 define Host/Install
-       $(MAKE) -C $(HOST_BUILD_DIR) install \
-               AM_LDFLAGS="$(if $(HOST_STATIC_LINKING),-all-static)"
+       $(MAKE) -C $(HOST_BUILD_DIR) install
        mv $(STAGING_DIR_HOST)/bin/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config.real
        $(INSTALL_BIN) ./files/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config
 endef

diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile
index 34440ee8535c4e8fc1c9cbcd6f99f3b1c2fc3f7d..bffbaa45e78414973b097977c734c2d78bb305d9 100644 (file)
--- a/tools/qemu/Makefile
+++ b/tools/qemu/Makefile
@@ -17,7 +17,6 @@ PKG_MD5SUM:=b6c713a8db638e173af53a62d5178640
 include $(INCLUDE_DIR)/host-build.mk
 
 HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
-HOST_LDFLAGS += $(HOST_STATIC_LINKING)
 
 define Host/Configure
        (cd $(HOST_BUILD_DIR); \

diff --git a/tools/sed/Makefile b/tools/sed/Makefile
index 27169540b80e689e73a80994f76f347e0d226f70..0e130e249abac53e71b03c666718aa47f18574e3 100644 (file)
--- a/tools/sed/Makefile
+++ b/tools/sed/Makefile
@@ -29,7 +29,7 @@ HOST_CONFIGURE_VARS += \
        ac_cv_header_selinux_selinux_h=no \
 
 define Host/Compile
-       +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" LDFLAGS="$(HOST_STATIC_LINKING)"
+       +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) SHELL="$(BASH)"
 endef
 
 define Host/Install

diff --git a/tools/squashfs/Makefile b/tools/squashfs/Makefile
index 6dc27d6750451b4182a5863f28c1f167e45ce1fa..88416bd95d48fd7b43ec08a8ce5e8bb16a75bbe2 100644 (file)
--- a/tools/squashfs/Makefile
+++ b/tools/squashfs/Makefile
@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/host-build.mk
 define Host/Compile
        $(MAKE) -C $(HOST_BUILD_DIR)/squashfs-tools \
                CC="$(HOSTCC)" \
-               CXX="$(CXX) $(HOST_STATIC_LINKING)" \
+               CXX="$(CXX)" \
                LZMAPATH=$(STAGING_DIR_HOST)/lib \
                mksquashfs-lzma unsquashfs-lzma 
 endef

diff --git a/tools/squashfs4/Makefile b/tools/squashfs4/Makefile
index b838b46c55a10e2091d8fd54e6a77bf602a16ac1..50b70fbe1c90108a3bb21beefce7cd4f928ad5e8 100644 (file)
--- a/tools/squashfs4/Makefile
+++ b/tools/squashfs4/Makefile
@@ -26,7 +26,6 @@ define Host/Compile
                XATTR_SUPPORT= \
                LZMA_LIB="$(STAGING_DIR_HOST)/lib/liblzma.a" \
                EXTRA_CFLAGS="-I$(STAGING_DIR_HOST)/include" \
-               EXTRA_LDFLAGS="$(HOST_STATIC_LINKING)" \
                mksquashfs unsquashfs
 endef
 

diff --git a/tools/sstrip/Makefile b/tools/sstrip/Makefile
index 045d080785a5acef3187c348511d91443144deaa..180bd1743e5d6402707504ba1dfddb126867af29 100644 (file)
--- a/tools/sstrip/Makefile
+++ b/tools/sstrip/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=sstrip
 include $(INCLUDE_DIR)/host-build.mk
 
 define Host/Compile
-       $(HOSTCC) $(HOST_CFLAGS) -include endian.h $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/sstrip src/sstrip.c
+       $(HOSTCC) $(HOST_CFLAGS) -include endian.h -o $(HOST_BUILD_DIR)/sstrip src/sstrip.c
 endef
 
 define Host/Install

diff --git a/tools/upslug2/Makefile b/tools/upslug2/Makefile
index e80cef0eb4bd441e8de640de05395a7ff4abd3f3..33b1ff5a42bbc014f9cae0eae984cc17f3e85fc1 100644 (file)
--- a/tools/upslug2/Makefile
+++ b/tools/upslug2/Makefile
@@ -18,7 +18,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 include $(INCLUDE_DIR)/host-build.mk
 
 unexport CFLAGS
-HOST_LDFLAGS += $(HOST_STATIC_LINKING)
 
 define Host/Configure
        (cd $(HOST_BUILD_DIR); \

diff --git a/tools/upx/Makefile b/tools/upx/Makefile
index a095ee12689fad7a47ccf3c6a0b26e4628a2572e..7f212affb3a718596f083e47ddd290747e451139 100644 (file)
--- a/tools/upx/Makefile
+++ b/tools/upx/Makefile
@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/host-build.mk
 define Host/Compile
        rm -f $(HOST_BUILD_DIR)/src/.depend
        $(MAKE) UPX_LZMADIR="$(BUILD_DIR_HOST)/lzma-4.65" -C $(HOST_BUILD_DIR)/src \
-               CXXFLAGS_WERROR="" LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" \
+               CXXFLAGS_WERROR="" LDFLAGS="$(HOST_LDFLAGS)" \
                CXX="$(HOSTCXX)"
 endef
 

diff --git a/tools/wrt350nv2-builder/Makefile b/tools/wrt350nv2-builder/Makefile
index 755f27dc602aa5f3151a299349d4b5bbf8b32a81..a705b6dc8d8a191010b8f36132408a029d0c7ba7 100644 (file)
--- a/tools/wrt350nv2-builder/Makefile
+++ b/tools/wrt350nv2-builder/Makefile
@@ -19,7 +19,7 @@ define Host/Compile
        $(HOSTCC) $(HOST_CFLAGS) -c src/md5.c -o $(HOST_BUILD_DIR)/md5.o
        $(HOSTCC) $(HOST_CFLAGS) -c src/ioapi.c -o $(HOST_BUILD_DIR)/ioapi.o
        $(HOSTCC) $(HOST_CFLAGS) -c src/wrt350nv2-builder.c -o $(HOST_BUILD_DIR)/wrt350nv2-builder.o
-       $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/wrt350nv2-builder \
+       $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $(HOST_BUILD_DIR)/wrt350nv2-builder \
                $(HOST_BUILD_DIR)/wrt350nv2-builder.o $(HOST_BUILD_DIR)/md5.o $(HOST_BUILD_DIR)/ioapi.o
 endef
 

diff --git a/tools/xz/Makefile b/tools/xz/Makefile
index 8156c92c7c74d577eb2aa2bb5328b29951a66ec6..f80d8965828581dfdc845526c1bdcd10af2eee68 100644 (file)
--- a/tools/xz/Makefile
+++ b/tools/xz/Makefile
@@ -17,11 +17,8 @@ HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_LDFLAGS += $(HOST_STATIC_LINKING)
-
 define Host/Install
-       +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat" \
-               AM_LDFLAGS="$(if $(HOST_STATIC_LINKING),-all-static)"
+       +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat"
 endef
 
 $(eval $(call HostBuild))

diff --git a/tools/yaffs2/Makefile b/tools/yaffs2/Makefile
index 22c4ecaeb67feecb743420d24c6dc58340ab14ca..bc98a6c8f52effa1a4da03a6c09fad72344a99f3 100644 (file)
--- a/tools/yaffs2/Makefile
+++ b/tools/yaffs2/Makefile
@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/host-build.mk
 
 define Host/Compile
        $(MAKE) -C $(HOST_BUILD_DIR)/yaffs2/utils \
-               CC="$(HOSTCC) $(HOST_STATIC_LINKING)" \
+               CC="$(HOSTCC)" \
                CFLAGS="$(HOST_CFLAGS) -include endian.h" \
                mkyaffs2image
 endef