ralink: don't build mkhilinkfw untilt he ssl header dependency is resolved

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

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index 7d597af901467c9429f175ee80856b587677b7b9..3dccb591f50e098ba982b73135481f72a5b9294d 100644 (file)
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -1,26 +1,26 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=mtd
-PKG_VERSION:=20101001
+PKG_NAME:=mtd-utils
+PKG_VERSION:=1.4.5
 
 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:=e2ddf154e1050faea5a24cf44345aec0d715a8c9
+PKG_SOURCE_VERSION:=5319b84974fcb71504aed2d1b8285e9c0a4a4bb8
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_MD5SUM:=fd168f4e41614e2a819f4e49e83431bc
 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
@@ -28,18 +28,20 @@ endif
 
 MTD_MAKEOPTS = \
        CFLAGS="$(CFLAGS)" \
-       NO_LZO=1 WITHOUT_XATTR=1 \
+       LDFLAGS="$(HOST_LDFLAGS) $(HOST_STATIC_LINKING)" \
+       WITHOUT_LZO=1 WITHOUT_XATTR=1 \
+       LZMA_STATIC_LIB="$(STAGING_DIR_HOST)/lib/liblzma.a" \
        SUBDIRS="" \
        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