tools/e2fsprogs: fix build under macos

[openwrt/openwrt.git] / tools / e2fsprogs / Makefile

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index dc4dc70aee9b4c978687d6c990141be0abbb655e..d7c994c3385d853c22f1e505ceb4d8d419ddd0fc 100644 (file)
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010-2012 OpenWrt.org
+# Copyright (C) 2010-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,25 +8,34 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.42.4
-PKG_MD5SUM:=b6e296f210d642361b7394437ff0f318
+PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
+PKG_VERSION:=1.45.6
+PKG_HASH:=ffa7ae6954395abdc50d0f8605d8be84736465afc53b8938ef473fcf7ff44256
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/e2fsprogs
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
+
+HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
+ifneq ($(shell $(HOSTCC) --version | grep clang),)
+  HOST_CFLAGS += -D__GNUC_PREREQ\(...\)=0 -Dloff_t=off_t
+endif
 HOST_CFLAGS += $(FPIC)
-HOST_LDFLAGS += -static
 
 HOST_CONFIGURE_ARGS += \
-       --disable-shared \
        --disable-elf-shlibs \
-       --enable-static \
-       --enable-dynamic-e2fsck \
+       --enable-libuuid \
        --disable-tls \
-       --disable-nls
+       --disable-nls \
+       --enable-threads=pth
+
+define Host/Prepare
+       $(call Host/Prepare/Default)
+       rm -rf $(HOST_BUILD_DIR)/doc
+endef
 
 define Host/Install
        $(Host/Install/Default)