[tools] host/include/getline.h - Mac OS X 10.7 (Lion) fix

[openwrt.git] / tools / mtd-utils / Makefile

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index e298e42..4d5117b 100644 (file)
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -7,20 +7,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtd
-PKG_VERSION:=20100912
+PKG_VERSION:=20101124
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e5a8bd7061921a9a787ffbb2c47a5af8f439d342
+PKG_SOURCE_VERSION:=c1a7889da754dfac2f130772daef783980c65d5d
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_MD5SUM:=1ad3e00b0f59d796ad76f18f15240b39
+PKG_MD5SUM:=78e5e74957f458bd808a6d4af0a38071
 PKG_CAT:=zcat
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
+HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
 CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) -L$(STAGING_DIR_HOST)/lib -DNO_NATIVE_SUPPORT
 ifneq ($(HOST_OS),Linux)
 CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h -I$(CURDIR)/include -include fls.h
@@ -33,13 +34,13 @@ MTD_MAKEOPTS = \
        BUILDDIR="$(HOST_BUILD_DIR)"
 
 define Host/Compile
-       $(MAKE) -C $(HOST_BUILD_DIR) \
-               $(MTD_MAKEOPTS) \
-               TARGETS=mkfs.jffs2
        $(MAKE) -C $(HOST_BUILD_DIR)/lib \
                $(MTD_MAKEOPTS) \
                TARGETS="libmtd.a libcrc32.a" \
                LIBS="libmtd libcrc32"
+       $(MAKE) -C $(HOST_BUILD_DIR) \
+               $(MTD_MAKEOPTS) \
+               TARGETS=mkfs.jffs2
        $(MAKE) -C $(HOST_BUILD_DIR)/ubi-utils \
                $(MTD_MAKEOPTS) \
                TARGETS=ubinize