armsr: armv8: enable serial console for Renesas platforms

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

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index 7afd60d4bcae3d0b133b8c6485003f922c3bb897..567e6a4c9a8ffbc5fa4f104314dcbd18d895162a 100644 (file)
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010 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,28 +8,42 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.41.10
-PKG_MD5SUM:=f9c7bb5c036a119453ce02fa871038da
+PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
+PKG_VERSION:=1.47.0
+PKG_HASH:=0b4fe723d779b0927fb83c9ae709bc7b40f66d7df36433bef143e41c54257084
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/e2fsprogs
+PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
 
-include $(INCLUDE_DIR)/host-build.mk
+HOST_BUILD_PARALLEL:=1
 
-TARGET_CFLAGS += $(FPIC)
+include $(INCLUDE_DIR)/host-build.mk
 
-CONFIGURE_ARGS += \
-       --disable-shared \
-       --enable-static \
-       --disable-rpath \
-       --enable-elf-shlibs \
-       --enable-dynamic-e2fsck \
-       --disable-tls
+ifneq ($(shell $(HOSTCC) --version | grep clang),)
+  HOST_CFLAGS += -D__GNUC_PREREQ\(...\)=0 -Dloff_t=off_t
+endif
+HOST_CFLAGS += $(HOST_FPIC)
+
+HOST_CONFIGURE_ARGS += \
+       --disable-elf-shlibs \
+       --enable-libuuid \
+       --disable-tls \
+       --disable-nls \
+       --enable-threads=pth \
+       --disable-fuse2fs
+
+define Host/Prepare
+       $(call Host/Prepare/Default)
+       rm -rf $(HOST_BUILD_DIR)/doc
+endef
 
 define Host/Install
        $(Host/Install/Default)
        $(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid install
+       mkdir -p $(STAGING_DIR_HOST)/include/e2fsprogs
+       $(CP) $(STAGING_DIR_HOST)/include/uuid $(STAGING_DIR_HOST)/include/e2fsprogs/
+       rm -rf $(STAGING_DIR_HOST)/include/uuid
        $(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(STAGING_DIR_HOST)/lib/
 endef