hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
openwrt/tools/mtd-utils/patches/310-add-static-linking-opti...

44 lines
1.1 KiB
Diff
Raw Normal View History

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 <jow@openwrt.org> SVN-Revision: 46908
2015-09-14 14:51:07 +00:00
--- a/common.mk
+++ b/common.mk
tools/mtd-utils: avoid linking libm statically Rework static linker flags to not link libm statically, this should fix the build on CentOS where libm.a is not provided by the libc devel package. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 46989
2015-09-17 13:07:48 +00:00
@@ -2,6 +2,16 @@ CC := $(CROSS)gcc
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 <jow@openwrt.org> SVN-Revision: 46908
2015-09-14 14:51:07 +00:00
AR := $(CROSS)ar
RANLIB := $(CROSS)ranlib
+ifeq ($(STATIC),1)
tools/mtd-utils: avoid linking libm statically Rework static linker flags to not link libm statically, this should fix the build on CentOS where libm.a is not provided by the libc devel package. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 46989
2015-09-17 13:07:48 +00:00
+ define static_link
+ -Wl,-Bstatic $(1) -Wl,-Bdynamic
+ endef
+else
+ define static_link
+ $(1)
+ endef
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 <jow@openwrt.org> SVN-Revision: 46908
2015-09-14 14:51:07 +00:00
+endif
+
# Stolen from Linux build system
comma = ,
try-run = $(shell set -e; ($(1)) >/dev/null 2>&1 && echo "$(2)" || echo "$(3)")
tools/mtd-utils: avoid linking libm statically Rework static linker flags to not link libm statically, this should fix the build on CentOS where libm.a is not provided by the libc devel package. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 46989
2015-09-17 13:07:48 +00:00
--- a/Makefile
+++ b/Makefile
@@ -89,10 +89,10 @@ obj-mkfs.jffs2 = compr_rtime.o compr_zli
compr_lzma.o lzma/LzFind.o lzma/LzmaEnc.o lzma/LzmaDec.o \
compr.o rbtree.o
LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
-LDLIBS_mkfs.jffs2 = -lz $(LZOLDLIBS)
+LDLIBS_mkfs.jffs2 = $(call static_link,-lz $(LZOLDLIBS))
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 <jow@openwrt.org> SVN-Revision: 46908
2015-09-14 14:51:07 +00:00
tools/mtd-utils: avoid linking libm statically Rework static linker flags to not link libm statically, this should fix the build on CentOS where libm.a is not provided by the libc devel package. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 46989
2015-09-17 13:07:48 +00:00
LDFLAGS_jffs2reader = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
-LDLIBS_jffs2reader = -lz $(LZOLDLIBS)
+LDLIBS_jffs2reader = $(call static_link,-lz $(LZOLDLIBS))
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 <jow@openwrt.org> SVN-Revision: 46908
2015-09-14 14:51:07 +00:00
tools/mtd-utils: avoid linking libm statically Rework static linker flags to not link libm statically, this should fix the build on CentOS where libm.a is not provided by the libc devel package. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 46989
2015-09-17 13:07:48 +00:00
$(foreach v,$(MTD_BINS),$(eval $(call mkdep,,$(v))))
kernel: remove ubifs xz decompression support It has been unused, and less useful than squashfs for cases where flash space usage matters. Signed-off-by: Felix Fietkau <nbd@nbd.name>
2017-01-09 13:00:24 +00:00
@@ -114,7 +114,7 @@ else
LZOLDLIBS = -llzo2
tools/mtd-utils: avoid linking libm statically Rework static linker flags to not link libm statically, this should fix the build on CentOS where libm.a is not provided by the libc devel package. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 46989
2015-09-17 13:07:48 +00:00
endif
kernel: remove ubifs xz decompression support It has been unused, and less useful than squashfs for cases where flash space usage matters. Signed-off-by: Felix Fietkau <nbd@nbd.name>
2017-01-09 13:00:24 +00:00
-LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid
+LDLIBS_mkfs.ubifs = $(call static_link,-lz $(LZOLDLIBS)) -lm $(call static_link,-luuid)
tools/mtd-utils: avoid linking libm statically Rework static linker flags to not link libm statically, this should fix the build on CentOS where libm.a is not provided by the libc devel package. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 46989
2015-09-17 13:07:48 +00:00
$(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a)
#