Author: jow Date: 2015-02-06 01:00:43 +0100 (Fri, 06 Feb 2015) New Revision: 44285
Modified: trunk/tools/bison/Makefile trunk/tools/ccache/Makefile trunk/tools/dosfstools/Makefile trunk/tools/e2fsprogs/Makefile trunk/tools/elftosb/Makefile trunk/tools/firmware-utils/Makefile trunk/tools/flex/Makefile trunk/tools/flock/Makefile trunk/tools/genext2fs/Makefile trunk/tools/lzma/Makefile trunk/tools/m4/Makefile trunk/tools/mkimage/Makefile trunk/tools/mklibs/Makefile trunk/tools/mtd-utils/Makefile trunk/tools/mtools/Makefile trunk/tools/padjffs2/Makefile trunk/tools/patch-image/Makefile trunk/tools/pkg-config/Makefile trunk/tools/qemu/Makefile trunk/tools/sed/Makefile trunk/tools/squashfs/Makefile trunk/tools/squashfs4/Makefile trunk/tools/sstrip/Makefile trunk/tools/upslug2/Makefile trunk/tools/upx/Makefile trunk/tools/wrt350nv2-builder/Makefile trunk/tools/xz/Makefile trunk/tools/yaffs2/Makefile Log: tools: remove static linking support Signed-off-by: Jo-Philipp Wich <[email protected]> Modified: trunk/tools/bison/Makefile =================================================================== --- trunk/tools/bison/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/bison/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -18,8 +18,6 @@ include $(INCLUDE_DIR)/host-build.mk -HOST_LDFLAGS += $(HOST_STATIC_LINKING) - define Host/Clean -$(MAKE) -C $(HOST_BUILD_DIR) uninstall $(call Host/Clean/Default) Modified: trunk/tools/ccache/Makefile =================================================================== --- trunk/tools/ccache/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/ccache/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -16,7 +16,6 @@ include $(INCLUDE_DIR)/host-build.mk -HOST_LDFLAGS += $(HOST_STATIC_LINKING) HOST_CONFIGURE_VARS += CC="$(HOSTCC_NOCACHE)" define Host/Install/ccache Modified: trunk/tools/dosfstools/Makefile =================================================================== --- trunk/tools/dosfstools/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/dosfstools/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -16,7 +16,7 @@ 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 Modified: trunk/tools/e2fsprogs/Makefile =================================================================== --- trunk/tools/e2fsprogs/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/e2fsprogs/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -20,7 +20,6 @@ include $(INCLUDE_DIR)/host-build.mk HOST_CFLAGS += $(FPIC) -HOST_LDFLAGS += $(HOST_STATIC_LINKING) HOST_CONFIGURE_ARGS += \ --disable-shared \ Modified: trunk/tools/elftosb/Makefile =================================================================== --- trunk/tools/elftosb/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/elftosb/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -16,7 +16,7 @@ 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 Modified: trunk/tools/firmware-utils/Makefile =================================================================== --- trunk/tools/firmware-utils/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/firmware-utils/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -12,7 +12,7 @@ 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 Modified: trunk/tools/flex/Makefile =================================================================== --- trunk/tools/flex/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/flex/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -19,7 +19,6 @@ 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 Modified: trunk/tools/flock/Makefile =================================================================== --- trunk/tools/flock/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/flock/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -12,7 +12,7 @@ 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 Modified: trunk/tools/genext2fs/Makefile =================================================================== --- trunk/tools/genext2fs/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/genext2fs/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -36,7 +36,7 @@ define Host/Compile $(MAKE) -C $(HOST_BUILD_DIR) \ CFLAGS="$(HOST_CFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" \ + LDFLAGS="$(HOST_LDFLAGS)" \ all endef Modified: trunk/tools/lzma/Makefile =================================================================== --- trunk/tools/lzma/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/lzma/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -21,8 +21,8 @@ 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 Modified: trunk/tools/m4/Makefile =================================================================== --- trunk/tools/m4/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/m4/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -20,8 +20,6 @@ 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) Modified: trunk/tools/mkimage/Makefile =================================================================== --- trunk/tools/mkimage/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/mkimage/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -32,9 +32,7 @@ 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 Modified: trunk/tools/mklibs/Makefile =================================================================== --- trunk/tools/mklibs/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/mklibs/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -18,7 +18,6 @@ include $(INCLUDE_DIR)/host-build.mk HOST_CFLAGS += -I$(CURDIR)/include -HOST_LDFLAGS += $(HOST_STATIC_LINKING) define Host/Install $(INSTALL_BIN) \ Modified: trunk/tools/mtd-utils/Makefile =================================================================== --- trunk/tools/mtd-utils/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/mtd-utils/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -29,7 +29,7 @@ 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="" \ Modified: trunk/tools/mtools/Makefile =================================================================== --- trunk/tools/mtools/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/mtools/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -21,8 +21,6 @@ HOST_CONFIGURE_VARS += \ ac_cv_header_iconv_h=no -HOST_LDFLAGS += $(HOST_STATIC_LINKING) - define Host/Compile $(MAKE) -C $(HOST_BUILD_DIR) mcopy endef Modified: trunk/tools/padjffs2/Makefile =================================================================== --- trunk/tools/padjffs2/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/padjffs2/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -19,7 +19,7 @@ endef define Host/Compile - $(MAKE) -C $(HOST_BUILD_DIR) LDFLAGS="$(HOST_STATIC_LINKING)" + $(MAKE) -C $(HOST_BUILD_DIR) endef define Host/Configure Modified: trunk/tools/patch-image/Makefile =================================================================== --- trunk/tools/patch-image/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/patch-image/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -11,8 +11,8 @@ 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 Modified: trunk/tools/pkg-config/Makefile =================================================================== --- trunk/tools/pkg-config/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/pkg-config/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -17,14 +17,12 @@ 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 Modified: trunk/tools/qemu/Makefile =================================================================== --- trunk/tools/qemu/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/qemu/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -17,7 +17,6 @@ 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); \ Modified: trunk/tools/sed/Makefile =================================================================== --- trunk/tools/sed/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/sed/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -29,7 +29,7 @@ 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 Modified: trunk/tools/squashfs/Makefile =================================================================== --- trunk/tools/squashfs/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/squashfs/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -21,7 +21,7 @@ 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 Modified: trunk/tools/squashfs4/Makefile =================================================================== --- trunk/tools/squashfs4/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/squashfs4/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -26,7 +26,6 @@ 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 Modified: trunk/tools/sstrip/Makefile =================================================================== --- trunk/tools/sstrip/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/sstrip/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -11,7 +11,7 @@ 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 Modified: trunk/tools/upslug2/Makefile =================================================================== --- trunk/tools/upslug2/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/upslug2/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -18,7 +18,6 @@ include $(INCLUDE_DIR)/host-build.mk unexport CFLAGS -HOST_LDFLAGS += $(HOST_STATIC_LINKING) define Host/Configure (cd $(HOST_BUILD_DIR); \ Modified: trunk/tools/upx/Makefile =================================================================== --- trunk/tools/upx/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/upx/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -21,7 +21,7 @@ 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 Modified: trunk/tools/wrt350nv2-builder/Makefile =================================================================== --- trunk/tools/wrt350nv2-builder/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/wrt350nv2-builder/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -19,7 +19,7 @@ $(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 Modified: trunk/tools/xz/Makefile =================================================================== --- trunk/tools/xz/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/xz/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -17,11 +17,8 @@ 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)) Modified: trunk/tools/yaffs2/Makefile =================================================================== --- trunk/tools/yaffs2/Makefile 2015-02-05 23:32:17 UTC (rev 44284) +++ trunk/tools/yaffs2/Makefile 2015-02-06 00:00:43 UTC (rev 44285) @@ -22,7 +22,7 @@ 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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
