hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools: remove static linking support

Browse Source 
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 44285
master
Jo-Philipp Wich 10 years ago
parent 5f65074523
commit f7e56763e1
28 changed files with 20 additions and 40 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      tools/bison/Makefile
  2. 1
      tools/ccache/Makefile
  3. 2
      tools/dosfstools/Makefile
  4. 1
      tools/e2fsprogs/Makefile
  5. 2
      tools/elftosb/Makefile
  6. 2
      tools/firmware-utils/Makefile
  7. 1
      tools/flex/Makefile
  8. 2
      tools/flock/Makefile
  9. 2
      tools/genext2fs/Makefile
  10. 4
      tools/lzma/Makefile
  11. 2
      tools/m4/Makefile
  12. 4
      tools/mkimage/Makefile
  13. 1
      tools/mklibs/Makefile
  14. 2
      tools/mtd-utils/Makefile
  15. 2
      tools/mtools/Makefile
  16. 2
      tools/padjffs2/Makefile
  17. 4
      tools/patch-image/Makefile
  18. 4
      tools/pkg-config/Makefile
  19. 1
      tools/qemu/Makefile
  20. 2
      tools/sed/Makefile
  21. 2
      tools/squashfs/Makefile
  22. 1
      tools/squashfs4/Makefile
  23. 2
      tools/sstrip/Makefile
  24. 1
      tools/upslug2/Makefile
  25. 2
      tools/upx/Makefile
  26. 2
      tools/wrt350nv2-builder/Makefile
  27. 5
      tools/xz/Makefile
  28. 2
      tools/yaffs2/Makefile

2
tools/bison/Makefile
Unescape View File

@ -18,8 +18,6 @@ HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Clean define Host/Clean
-$(MAKE) -C $(HOST_BUILD_DIR) uninstall -$(MAKE) -C $(HOST_BUILD_DIR) uninstall
$(call Host/Clean/Default) $(call Host/Clean/Default)

1
tools/ccache/Makefile vendored
Unescape View File

@ -16,7 +16,6 @@ PKG_MD5SUM:=522a6016bda56892653612bbdefff3e0
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += $(HOST_STATIC_LINKING)
HOST_CONFIGURE_VARS += CC="$(HOSTCC_NOCACHE)" HOST_CONFIGURE_VARS += CC="$(HOSTCC_NOCACHE)"
define Host/Install/ccache define Host/Install/ccache

2
tools/dosfstools/Makefile
Unescape View File

@ -16,7 +16,7 @@ PKG_MD5SUM:=45012f5f56f2aae3afcd62120b9e5a08
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
define Host/Compile 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 endef
define Host/Install define Host/Install

1
tools/e2fsprogs/Makefile
Unescape View File

@ -20,7 +20,6 @@ HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_CFLAGS += $(FPIC) HOST_CFLAGS += $(FPIC)
HOST_LDFLAGS += $(HOST_STATIC_LINKING)
HOST_CONFIGURE_ARGS += \ HOST_CONFIGURE_ARGS += \
--disable-shared \ --disable-shared \

2
tools/elftosb/Makefile
Unescape View File

@ -16,7 +16,7 @@ PKG_MD5SUM:=e8005d606c1e0bb3507c82f6eceb3056
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
define Host/Compile define Host/Compile
$(MAKE) -C $(HOST_BUILD_DIR) LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" $(MAKE) -C $(HOST_BUILD_DIR) LDFLAGS="$(HOST_LDFLAGS)"
endef endef
define Host/Install define Host/Install

2
tools/firmware-utils/Makefile
Unescape View File

@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
define cc 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 endef
define Host/Compile define Host/Compile

1
tools/flex/Makefile
Unescape View File

@ -19,7 +19,6 @@ HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_CONFIGURE_ARGS += --disable-shared HOST_CONFIGURE_ARGS += --disable-shared
HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Clean define Host/Clean
-$(MAKE) -C $(HOST_BUILD_DIR) uninstall -$(MAKE) -C $(HOST_BUILD_DIR) uninstall

2
tools/flock/Makefile
Unescape View File

@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/host-build.mk
define Host/Compile define Host/Compile
mkdir -p $(HOST_BUILD_DIR) 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 endef
define Host/Install define Host/Install

2
tools/genext2fs/Makefile
Unescape View File

@ -36,7 +36,7 @@ HOST_CONFIGURE_ARGS = \
define Host/Compile define Host/Compile
$(MAKE) -C $(HOST_BUILD_DIR) \ $(MAKE) -C $(HOST_BUILD_DIR) \
CFLAGS="$(HOST_CFLAGS)" \ CFLAGS="$(HOST_CFLAGS)" \
LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" \ LDFLAGS="$(HOST_LDFLAGS)" \
all all
endef endef

4
tools/lzma/Makefile
Unescape View File

@ -21,8 +21,8 @@ UTIL_DIR=$(HOST_BUILD_DIR)/C/LzmaUtil
ALONE_DIR=$(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone ALONE_DIR=$(HOST_BUILD_DIR)/CPP/7zip/Compress/LZMA_Alone
define Host/Compile define Host/Compile
$(MAKE) -C $(UTIL_DIR) -f makefile.gcc LDFLAGS="$(HOST_STATIC_LINKING)" $(MAKE) -C $(UTIL_DIR) -f makefile.gcc
$(MAKE) -C $(ALONE_DIR) -f makefile.gcc LDFLAGS="$(HOST_STATIC_LINKING)" $(MAKE) -C $(ALONE_DIR) -f makefile.gcc
endef endef
define Host/Install define Host/Install

2
tools/m4/Makefile
Unescape View File

@ -20,8 +20,6 @@ include $(INCLUDE_DIR)/host-build.mk
HOST_CONFIGURE_VARS += gl_cv_func_strstr_linear=no HOST_CONFIGURE_VARS += gl_cv_func_strstr_linear=no
HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Clean define Host/Clean
-$(MAKE) -C $(HOST_BUILD_DIR) uninstall -$(MAKE) -C $(HOST_BUILD_DIR) uninstall
$(call Host/Clean/Default) $(call Host/Clean/Default)

4
tools/mkimage/Makefile
Unescape View File

@ -32,9 +32,7 @@ endef
define Host/Compile define Host/Compile
$(MAKE) -C $(HOST_BUILD_DIR) defconfig $(MAKE) -C $(HOST_BUILD_DIR) defconfig
$(MAKE) -C $(HOST_BUILD_DIR) \ $(MAKE) -C $(HOST_BUILD_DIR) tools-only
HOSTLDFLAGS="$(HOST_STATIC_LINKING)" \
tools-only
endef endef
define Host/Install define Host/Install

1
tools/mklibs/Makefile
Unescape View File

@ -18,7 +18,6 @@ HOST_FIXUP:=autoreconf
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_CFLAGS += -I$(CURDIR)/include HOST_CFLAGS += -I$(CURDIR)/include
HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Install define Host/Install
$(INSTALL_BIN) \ $(INSTALL_BIN) \

2
tools/mtd-utils/Makefile
Unescape View File

@ -29,7 +29,7 @@ endif
MTD_MAKEOPTS = \ MTD_MAKEOPTS = \
CFLAGS="$(CFLAGS)" \ CFLAGS="$(CFLAGS)" \
LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" \ LDFLAGS="$(HOST_LDFLAGS)" \
WITHOUT_LZO=1 WITHOUT_XATTR=1 \ WITHOUT_LZO=1 WITHOUT_XATTR=1 \
LZMA_STATIC_LIB="$(STAGING_DIR_HOST)/lib/liblzma.a" \ LZMA_STATIC_LIB="$(STAGING_DIR_HOST)/lib/liblzma.a" \
SUBDIRS="" \ SUBDIRS="" \

2
tools/mtools/Makefile
Unescape View File

@ -21,8 +21,6 @@ include $(INCLUDE_DIR)/host-build.mk
HOST_CONFIGURE_VARS += \ HOST_CONFIGURE_VARS += \
ac_cv_header_iconv_h=no ac_cv_header_iconv_h=no
HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Compile define Host/Compile
$(MAKE) -C $(HOST_BUILD_DIR) mcopy $(MAKE) -C $(HOST_BUILD_DIR) mcopy
endef endef

2
tools/padjffs2/Makefile
Unescape View File

@ -19,7 +19,7 @@ define Host/Prepare
endef endef
define Host/Compile define Host/Compile
$(MAKE) -C $(HOST_BUILD_DIR) LDFLAGS="$(HOST_STATIC_LINKING)" $(MAKE) -C $(HOST_BUILD_DIR)
endef endef
define Host/Configure define Host/Configure

4
tools/patch-image/Makefile
Unescape View File

@ -11,8 +11,8 @@ PKG_NAME:=patch-image
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
define Host/Compile 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 -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-dtb src/patch-dtb.c
endef endef
define Host/Install define Host/Install

4
tools/pkg-config/Makefile
Unescape View File

@ -17,14 +17,12 @@ HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += $(HOST_STATIC_LINKING)
unexport PKG_CONFIG unexport PKG_CONFIG
HOST_CONFIGURE_ARGS += --with-internal-glib HOST_CONFIGURE_ARGS += --with-internal-glib
define Host/Install define Host/Install
$(MAKE) -C $(HOST_BUILD_DIR) install \ $(MAKE) -C $(HOST_BUILD_DIR) install
AM_LDFLAGS="$(if $(HOST_STATIC_LINKING),-all-static)"
mv $(STAGING_DIR_HOST)/bin/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config.real 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 $(INSTALL_BIN) ./files/pkg-config $(STAGING_DIR_HOST)/bin/pkg-config
endef endef

1
tools/qemu/Makefile
Unescape View File

@ -17,7 +17,6 @@ PKG_MD5SUM:=b6c713a8db638e173af53a62d5178640
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Configure define Host/Configure
(cd $(HOST_BUILD_DIR); \ (cd $(HOST_BUILD_DIR); \

2
tools/sed/Makefile
Unescape View File

@ -29,7 +29,7 @@ HOST_CONFIGURE_VARS += \
ac_cv_header_selinux_selinux_h=no \ ac_cv_header_selinux_selinux_h=no \
define Host/Compile 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 endef
define Host/Install define Host/Install

2
tools/squashfs/Makefile
Unescape View File

@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/host-build.mk
define Host/Compile define Host/Compile
$(MAKE) -C $(HOST_BUILD_DIR)/squashfs-tools \ $(MAKE) -C $(HOST_BUILD_DIR)/squashfs-tools \
CC="$(HOSTCC)" \ CC="$(HOSTCC)" \
CXX="$(CXX) $(HOST_STATIC_LINKING)" \ CXX="$(CXX)" \
LZMAPATH=$(STAGING_DIR_HOST)/lib \ LZMAPATH=$(STAGING_DIR_HOST)/lib \
mksquashfs-lzma unsquashfs-lzma mksquashfs-lzma unsquashfs-lzma
endef endef

1
tools/squashfs4/Makefile
Unescape View File

@ -26,7 +26,6 @@ define Host/Compile
XATTR_SUPPORT= \ XATTR_SUPPORT= \
LZMA_LIB="$(STAGING_DIR_HOST)/lib/liblzma.a" \ LZMA_LIB="$(STAGING_DIR_HOST)/lib/liblzma.a" \
EXTRA_CFLAGS="-I$(STAGING_DIR_HOST)/include" \ EXTRA_CFLAGS="-I$(STAGING_DIR_HOST)/include" \
EXTRA_LDFLAGS="$(HOST_STATIC_LINKING)" \
mksquashfs unsquashfs mksquashfs unsquashfs
endef endef

2
tools/sstrip/Makefile
Unescape View File

@ -11,7 +11,7 @@ PKG_NAME:=sstrip
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
define Host/Compile 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 endef
define Host/Install define Host/Install

1
tools/upslug2/Makefile
Unescape View File

@ -18,7 +18,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
unexport CFLAGS unexport CFLAGS
HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Configure define Host/Configure
(cd $(HOST_BUILD_DIR); \ (cd $(HOST_BUILD_DIR); \

2
tools/upx/Makefile
Unescape View File

@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/host-build.mk
define Host/Compile define Host/Compile
rm -f $(HOST_BUILD_DIR)/src/.depend rm -f $(HOST_BUILD_DIR)/src/.depend
$(MAKE) UPX_LZMADIR="$(BUILD_DIR_HOST)/lzma-4.65" -C $(HOST_BUILD_DIR)/src \ $(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)" CXX="$(HOSTCXX)"
endef endef

2
tools/wrt350nv2-builder/Makefile
Unescape View File

@ -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/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/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) -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 $(HOST_BUILD_DIR)/wrt350nv2-builder.o $(HOST_BUILD_DIR)/md5.o $(HOST_BUILD_DIR)/ioapi.o
endef endef

5
tools/xz/Makefile
Unescape View File

@ -17,11 +17,8 @@ HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Install define Host/Install
+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat" \ +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat"
AM_LDFLAGS="$(if $(HOST_STATIC_LINKING),-all-static)"
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

2
tools/yaffs2/Makefile
Unescape View File

@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/host-build.mk
define Host/Compile define Host/Compile
$(MAKE) -C $(HOST_BUILD_DIR)/yaffs2/utils \ $(MAKE) -C $(HOST_BUILD_DIR)/yaffs2/utils \
CC="$(HOSTCC) $(HOST_STATIC_LINKING)" \ CC="$(HOSTCC)" \
CFLAGS="$(HOST_CFLAGS) -include endian.h" \ CFLAGS="$(HOST_CFLAGS) -include endian.h" \
mkyaffs2image mkyaffs2image
endef endef

Write Preview
Loading…
Cancel
Save