aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-09-14 15:15:15 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-09-14 15:15:15 +0000
commit01fb448d56b4559970ed8c7f67ba1312caf806a5 (patch)
tree8bedd7b9e68bc5dfd23a8b107468130e9dff5aa7 /tools
parentcf77766e64dfba8c72906edc3fdedaf71684ebc1 (diff)
downloadupstream-01fb448d56b4559970ed8c7f67ba1312caf806a5.tar.gz
upstream-01fb448d56b4559970ed8c7f67ba1312caf806a5.tar.bz2
upstream-01fb448d56b4559970ed8c7f67ba1312caf806a5.zip
tools/make-ext4fs: prefer static linking
Link zlib statically on Linux systems. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 46909
Diffstat (limited to 'tools')
-rw-r--r--tools/make-ext4fs/Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/make-ext4fs/Makefile b/tools/make-ext4fs/Makefile
index 62f7e27657..d6858cdd97 100644
--- a/tools/make-ext4fs/Makefile
+++ b/tools/make-ext4fs/Makefile
@@ -7,22 +7,26 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=make-ext4fs
-PKG_VERSION:=2015-05-01
+PKG_VERSION:=2015-09-14
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://git.openwrt.org/project/make_ext4fs.git
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7c15bef6c732896d9ffb883fb1480fcd60c94a50
+PKG_SOURCE_VERSION:=98e3d5c1ceddd4a32b92c1cfafe929fe006fb98c
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_MIRROR_MD5SUM:=d81eca37852cbf840108e1a8ad8fb22f
+PKG_MIRROR_MD5SUM:=c736e546de3b36da73f5e84a9ce3ffee
PKG_CAT:=zcat
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/host-build.mk
+ifeq ($(HOST_OS),Linux)
+ MAKE_STATIC := STATIC=1
+endif
+
define Host/Compile
- $(MAKE) -C $(HOST_BUILD_DIR) make_ext4fs
+ $(MAKE) -C $(HOST_BUILD_DIR) make_ext4fs $(MAKE_STATIC)
endef
define Host/Install