From b8767865eb0b4943dccbdd8caa671603aa626f31 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 8 Apr 2009 22:45:29 +0000
Subject: [PATCH] jffs2root: build host version of lzo and use for host
 mkfs.jffs2

---
 package/lzo/lzo.mk           | 42 ++++++++++++++++++++++++++++++++++++
 package/mtd/mtd-utils/mtd.mk | 14 ++++++------
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index aa9c69d78..1593b8368 100644
--- 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 f6b67da93..5a37f9edc 100644
--- 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)