qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 22:24:39 +02:00
Code

[tools] use HOST_STATIC_LINKING instead of hardcoding -static

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33140 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-08-12 12:34:30 +00:00
parent 036f79f8de
commit ba750f4141
23 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/bison/Makefile
View File

@ -16,7 +16,7 @@ PKG_CAT:=bzcat
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += -static 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/ccache/Makefile
View File

@ -16,7 +16,7 @@ PKG_MD5SUM:=80a698c22d0b06b19c88ac58e8d8b632
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += -static 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
View File

@ -16,7 +16,7 @@ PKG_CAT:=zcat
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) -static" $(MAKE) -C $(HOST_BUILD_DIR) SHELL="$(BASH)" LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)"
endef endef
define Host/Install define Host/Install

2
tools/e2fsprogs/Makefile
View File

@ -18,7 +18,7 @@ PKG_SOURCE_URL:=@SF/e2fsprogs
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_CFLAGS += $(FPIC) HOST_CFLAGS += $(FPIC)
HOST_LDFLAGS += -static HOST_LDFLAGS += $(HOST_STATIC_LINKING)
HOST_CONFIGURE_ARGS += \ HOST_CONFIGURE_ARGS += \
--disable-shared \ --disable-shared \

2
tools/firmware-utils/Makefile
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 -static -o $(HOST_BUILD_DIR)/bin/$(firstword $(1)) $(foreach src,$(1),src/$(src).c) $(2) $(HOSTCC) $(HOST_CFLAGS) -include endian.h $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/bin/$(firstword $(1)) $(foreach src,$(1),src/$(src).c) $(2)
endef endef
define Host/Compile define Host/Compile

2
tools/flex/Makefile
View File

@ -16,7 +16,7 @@ PKG_CAT:=bzcat
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += -static 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
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) -static -o $(HOST_BUILD_DIR)/flock src/flock.c $(HOSTCC) $(HOST_CFLAGS) $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/flock src/flock.c
endef endef
define Host/Install define Host/Install

2
tools/genext2fs/Makefile
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) -static" \ LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" \
all all
endef endef

2
tools/m4/Makefile
View File

@ -16,7 +16,7 @@ PKG_CAT:=zcat
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += -static 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/mklibs/Makefile
View File

@ -16,7 +16,7 @@ PKG_MD5SUM:=afe0ed527ba96b8a882b5de350603007
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_CFLAGS += -I$(CURDIR)/include HOST_CFLAGS += -I$(CURDIR)/include
HOST_LDFLAGS += -static HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Install define Host/Install
$(INSTALL_BIN) \ $(INSTALL_BIN) \

2
tools/mtd-utils/Makefile
View File

@ -28,7 +28,7 @@ endif
MTD_MAKEOPTS = \ MTD_MAKEOPTS = \
CFLAGS="$(CFLAGS)" \ CFLAGS="$(CFLAGS)" \
LDFLAGS="$(HOST_LDFLAGS) -static" \ LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" \
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
View File

@ -16,7 +16,7 @@ PKG_CAT:=zcat
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += -static HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Compile define Host/Compile
$(MAKE) -C $(HOST_BUILD_DIR) mcopy $(MAKE) -C $(HOST_BUILD_DIR) mcopy

2
tools/patch-cmdline/Makefile
View File

@ -11,7 +11,7 @@ PKG_NAME:=patch-cmdline
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
define Host/Compile define Host/Compile
$(HOSTCC) $(HOST_CFLAGS) -include endian.h -static -o $(HOST_BUILD_DIR)/$(PKG_NAME) src/$(PKG_NAME).c $(HOSTCC) $(HOST_CFLAGS) -include endian.h $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/$(PKG_NAME) src/$(PKG_NAME).c
endef endef
define Host/Install define Host/Install

5
tools/pkg-config/Makefile
View File

@ -15,10 +15,11 @@ PKG_MD5SUM:=a3270bab3f4b69b7dc6dbdacbcae9745
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += -static HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Install define Host/Install
$(MAKE) -C $(HOST_BUILD_DIR) install AM_LDFLAGS="-all-static" $(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

2
tools/qemu/Makefile
View File

@ -17,7 +17,7 @@ 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 += -static HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Configure define Host/Configure
(cd $(HOST_BUILD_DIR); \ (cd $(HOST_BUILD_DIR); \

2
tools/sdcc/Makefile
View File

@ -17,7 +17,7 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += -static HOST_LDFLAGS += $(HOST_STATIC_LINKING)
HOST_CONFIGURE_ARGS += \ HOST_CONFIGURE_ARGS += \
--disable-ucsim \ --disable-ucsim \
--enable-packihx \ --enable-packihx \

2
tools/squashfs/Makefile
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) -static" \ CXX="$(CXX) $(HOST_STATIC_LINKING)" \
LZMAPATH=$(STAGING_DIR_HOST)/lib \ LZMAPATH=$(STAGING_DIR_HOST)/lib \
mksquashfs-lzma unsquashfs-lzma mksquashfs-lzma unsquashfs-lzma
endef endef

2
tools/sstrip/Makefile
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) -I./include -include endian.h -static -o $(HOST_BUILD_DIR)/sstrip src/sstrip.c $(HOSTCC) $(HOST_CFLAGS) -I./include -include endian.h $(HOST_STATIC_LINKING) -o $(HOST_BUILD_DIR)/sstrip src/sstrip.c
endef endef
define Host/Install define Host/Install

2
tools/upslug2/Makefile
View File

@ -18,7 +18,7 @@ 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 += -static HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Configure define Host/Configure
(cd $(HOST_BUILD_DIR); \ (cd $(HOST_BUILD_DIR); \

2
tools/upx/Makefile
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) -static" CXXFLAGS_WERROR="" LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)"
endef endef
define Host/Install define Host/Install

2
tools/wrt350nv2-builder/Makefile
View File

@ -18,7 +18,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) -static -o $(HOST_BUILD_DIR)/wrt350nv2-builder \ $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_STATIC_LINKING) -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
View File

@ -15,10 +15,11 @@ PKG_MD5SUM:=8d900b742b94fa9e708ca4f5a4b29003
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
HOST_LDFLAGS += -static HOST_LDFLAGS += $(HOST_STATIC_LINKING)
define Host/Install define Host/Install
$(MAKE) -C $(HOST_BUILD_DIR) install xzlinks="unxz xzcat" AM_LDFLAGS="-all-static" $(MAKE) -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
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) -static" \ CC="$(HOSTCC) $(HOST_STATIC_LINKING)" \
CFLAGS="$(HOST_CFLAGS) -include endian.h" \ CFLAGS="$(HOST_CFLAGS) -include endian.h" \
mkyaffs2image mkyaffs2image
endef endef