Author: jow Date: 2015-09-14 16:51:07 +0200 (Mon, 14 Sep 2015) New Revision: 46908
Added: trunk/tools/mtd-utils/patches/310-add-static-linking-option.patch Modified: trunk/tools/mtd-utils/Makefile Log: tools/mtd-utils: prefer static linking - 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 <[email protected]> Modified: trunk/tools/mtd-utils/Makefile =================================================================== --- trunk/tools/mtd-utils/Makefile 2015-09-14 14:03:21 UTC (rev 46907) +++ trunk/tools/mtd-utils/Makefile 2015-09-14 14:51:07 UTC (rev 46908) @@ -25,6 +25,9 @@ CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) -L$(STAGING_DIR_HOST)/lib -DNO_NATIVE_SUPPORT 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 +MTD_STATIC := 0 +else +MTD_STATIC := 1 endif MTD_MAKEOPTS = \ @@ -32,7 +35,9 @@ LDFLAGS="$(HOST_LDFLAGS)" \ WITHOUT_LZO=1 WITHOUT_XATTR=1 \ SUBDIRS="" \ - BUILDDIR="$(HOST_BUILD_DIR)" + BUILDDIR="$(HOST_BUILD_DIR)" \ + STATIC=$(MTD_STATIC) \ + V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1) define Host/Compile $(MAKE) -C $(HOST_BUILD_DIR) \ Added: trunk/tools/mtd-utils/patches/310-add-static-linking-option.patch =================================================================== --- trunk/tools/mtd-utils/patches/310-add-static-linking-option.patch (rev 0) +++ trunk/tools/mtd-utils/patches/310-add-static-linking-option.patch 2015-09-14 14:51:07 UTC (rev 46908) @@ -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) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
