tools/mtd-utils/patches/310-add-static-linking-option.patch

   1 --- a/common.mk
   2 +++ b/common.mk
   3 @@ -2,6 +2,16 @@ CC := $(CROSS)gcc
   4  AR := $(CROSS)ar
   5  RANLIB := $(CROSS)ranlib
   6
   7 +ifeq ($(STATIC),1)
   8 + define static_link
   9 +  -Wl,-Bstatic $(1) -Wl,-Bdynamic
  10 + endef
  11 +else
  12 + define static_link
  13 +  $(1)
  14 + endef
  15 +endif
  16 +
  17  # Stolen from Linux build system
  18  comma = ,
  19  try-run = $(shell set -e; ($(1)) >/dev/null 2>&1 && echo "$(2)" || echo "$(3)")
  20 --- a/Makefile
  21 +++ b/Makefile
  22 @@ -89,10 +89,10 @@ obj-mkfs.jffs2 = compr_rtime.o compr_zli
  23         compr_lzma.o lzma/LzFind.o lzma/LzmaEnc.o lzma/LzmaDec.o \
  24         compr.o rbtree.o
  25  LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
  26 -LDLIBS_mkfs.jffs2  = -lz $(LZOLDLIBS)
  27 +LDLIBS_mkfs.jffs2  = $(call static_link,-lz $(LZOLDLIBS))
  28
  29  LDFLAGS_jffs2reader = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
  30 -LDLIBS_jffs2reader  = -lz $(LZOLDLIBS)
  31 +LDLIBS_jffs2reader  = $(call static_link,-lz $(LZOLDLIBS))
  32
  33  $(foreach v,$(MTD_BINS),$(eval $(call mkdep,,$(v))))
  34
  35 @@ -114,7 +114,7 @@ else
  36    LZOLDLIBS = -llzo2
  37  endif
  38
  39 -LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid
  40 +LDLIBS_mkfs.ubifs = $(call static_link,-lz $(LZOLDLIBS)) -lm $(call static_link,-luuid)
  41  $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a)
  42
  43  #