jffs2root: build host version of lzo and use for host mkfs.jffs2

diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index aa9c69d78f391be04373838caff5addc6da5251b..1593b8368b5e680656112e967e6f46078efd66ba 100644 (file)
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -14,3 +14,45 @@ LZO_CONF_ENV =
 LZO_DEPENDENCIES = uclibc
 
 $(eval $(call AUTOTARGETS,package,lzo))
+
+# lzo for the host
+LZO_HOST_DIR:=$(BUILD_DIR)/lzo-$(LZO_VERSION)-host
+
+$(DL_DIR)/$(LZO_SOURCE):
+       $(call DOWNLOAD,$(LZO_SITE),$(LZO_SOURCE))
+
+$(STAMP_DIR)/host_lzo_unpacked: $(DL_DIR)/$(LZO_SOURCE)
+       mkdir -p $(LZO_HOST_DIR)
+       $(INFLATE$(suffix $(LZO_SOURCE))) $< | \
+               $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(LZO_HOST_DIR) $(TAR_OPTIONS) -
+       toolchain/patch-kernel.sh $(LZO_HOST_DIR) package/lzo/ \*.patch
+       touch $@
+
+$(STAMP_DIR)/host_lzo_configured: $(STAMP_DIR)/host_lzo_unpacked
+       (cd $(LZO_HOST_DIR); rm -rf config.cache; \
+               $(HOST_CONFIGURE_OPTS) \
+               CFLAGS="$(HOST_CFLAGS)" \
+               LDFLAGS="$(HOST_LDFLAGS)" \
+               ./configure \
+               --prefix="$(HOST_DIR)/usr" \
+               --sysconfdir="$(HOST_DIR)/etc" \
+       )
+       touch $@
+
+$(STAMP_DIR)/host_lzo_compiled: $(STAMP_DIR)/host_lzo_configured
+       $(MAKE) -C $(LZO_HOST_DIR)
+       touch $@
+
+$(STAMP_DIR)/host_lzo_installed: $(STAMP_DIR)/host_lzo_compiled
+       $(MAKE) -C $(LZO_HOST_DIR) install
+       touch $@
+
+host-lzo: $(STAMP_DIR)/host_lzo_installed
+
+host-lzo-clean:
+       rm -f $(addprefix $(STAMP_DIR)/host_lzo_,unpacked configured compiled installed)
+       -$(MAKE) -C $(LZO_HOST_DIR) uninstall
+       -$(MAKE) -C $(LZO_HOST_DIR) clean
+
+host-lzo-dirclean:
+       rm -rf $(LZO_HOST_DIR)

diff --git a/package/mtd/mtd-utils/mtd.mk b/package/mtd/mtd-utils/mtd.mk
index f6b67da93c6f856289ddca7f5089c4bcd85cf11b..5a37f9edc36fa1dbbc9a7646ec984af63d9f1fa0 100644 (file)
--- a/package/mtd/mtd-utils/mtd.mk
+++ b/package/mtd/mtd-utils/mtd.mk
@@ -34,16 +34,16 @@ $(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
        touch $@
 
 
-$(MKFS_JFFS2): $(MTD_HOST_DIR)/.unpacked
-       CC="$(HOSTCC)" CROSS= CFLAGS=-I$(LINUX_HEADERS_DIR)/include \
-               $(MAKE) LINUXDIR=$(LINUX_DIR) \
-               BUILDDIR=$(MTD_HOST_DIR) \
+$(MKFS_JFFS2): $(MTD_HOST_DIR)/.unpacked $(STAMP_DIR)/host_lzo_installed
+       CC="$(HOSTCC)" CROSS= LDFLAGS=-L$(HOST_DIR)/usr/lib \
+               $(MAKE) CFLAGS='-I$(HOST_DIR)/usr/include -I./include' \
+               LINUXDIR=$(LINUX_DIR) BUILDDIR=$(MTD_HOST_DIR) \
                -C $(MTD_HOST_DIR) mkfs.jffs2
 
 $(SUMTOOL): $(MTD_HOST_DIR)/.unpacked
-       CC="$(HOSTCC)" CROSS= CFLAGS=-I$(LINUX_HEADERS_DIR)/include \
-               $(MAKE) LINUXDIR=$(LINUX_DIR) \
-               BUILDDIR=$(MTD_HOST_DIR) \
+       CC="$(HOSTCC)" CROSS= LDFLAGS=-L$(HOST_DIR)/usr/lib \
+               $(MAKE) CFLAGS='-I$(HOST_DIR)/usr/include -I./include' \
+               LINUXDIR=$(LINUX_DIR) BUILDDIR=$(MTD_HOST_DIR) \
                -C $(MTD_HOST_DIR) sumtool
 
 mtd-host: $(MKFS_JFFS2) $(SUMTOOL)