domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/mtd-utils: prefer static linking

Browse Source 
- Add patch for optional static linking preference
 - Prefer static linking on Linux systems
 - Enable verbose compiler messages when building with V=c

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

SVN-Revision: 46908
This commit is contained in:
Jo-Philipp Wich
2015-09-14 14:51:07 +00:00
parent b4e49ad8f0
commit cf77766e64
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/mtd-utils/Makefile
View File

@@ -25,6 +25,9 @@ HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) -L$(STAGING_DIR_HOST)/lib -DNO_NATIVE_SUPPORT CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) -L$(STAGING_DIR_HOST)/lib -DNO_NATIVE_SUPPORT
ifneq ($(HOST_OS),Linux) ifneq ($(HOST_OS),Linux)
CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h -I$(CURDIR)/include -include fls.h CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h -I$(CURDIR)/include -include fls.h
MTD_STATIC := 0
else
MTD_STATIC := 1
endif endif
MTD_MAKEOPTS = \ MTD_MAKEOPTS = \
@@ -32,7 +35,9 @@ MTD_MAKEOPTS = \
LDFLAGS="$(HOST_LDFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \
WITHOUT_LZO=1 WITHOUT_XATTR=1 \ WITHOUT_LZO=1 WITHOUT_XATTR=1 \
SUBDIRS="" \ SUBDIRS="" \
BUILDDIR="$(HOST_BUILD_DIR)" BUILDDIR="$(HOST_BUILD_DIR)" \
STATIC=$(MTD_STATIC) \
V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1)
define Host/Compile define Host/Compile
$(MAKE) -C $(HOST_BUILD_DIR) \ $(MAKE) -C $(HOST_BUILD_DIR) \

23
tools/mtd-utils/patches/310-add-static-linking-option.patch Normal file
View File

@@ -0,0 +1,23 @@
--- a/common.mk
+++ b/common.mk
@@ -2,6 +2,11 @@ CC := $(CROSS)gcc
AR := $(CROSS)ar
RANLIB := $(CROSS)ranlib
+ifeq ($(STATIC),1)
+ LD_STATIC_ON := -Wl,-Bstatic
+ LD_STATIC_OFF := -Wl,-Bdynamic
+endif
+
# Stolen from Linux build system
comma = ,
try-run = $(shell set -e; ($(1)) >/dev/null 2>&1 && echo "$(2)" || echo "$(3)")
@@ -68,7 +73,7 @@ endef
%: %.o $(LDDEPS)
$(call BECHO,LD)
- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_$(notdir $@)) -g -o $@ $^ $(LDLIBS) $(LDLIBS_$(notdir $@))
+ $(Q)$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_$(notdir $@)) -g -o $@ $(LD_STATIC_ON) $^ $(LDLIBS) $(LDLIBS_$(notdir $@)) $(LD_STATIC_OFF)
$(BUILDDIR)/%.a:
$(call BECHO,AR)