From 7c7fd376e6d348658dc3f49ce30fe8478ab7690d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 1 Mar 2014 10:33:19 +0100
Subject: bc needs flex, update TODO

---
 TODO                | 12 +++---------
 mk/build.mk         |  2 +-
 tools/Makefile      |  2 +-
 tools/flex/Makefile | 25 +++++++++++++++++++++++++
 4 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 tools/flex/Makefile

diff --git a/TODO b/TODO
index 05c85e9e6..6f2cb0c96 100644
--- a/TODO
+++ b/TODO
@@ -1,14 +1,8 @@
-- update gcc to 4.8.2
-- socat openssl flavour + update
-- use gnu_host_name for host_ dir
-- move target/tools to tools, mv binaries to host_ dir, use ADK_HOST_NEED_FOO (xz,lzop,bzip2,..)
-- add toolchain archive creation target (optimize for size)
-- hash-style=gnu for non-mips and non-musl
-- add arm hard and softfloat toolchains
+- move tools to package host infrastructure, resolve dependency handling for host tools
 - add misp64 n32/n64 toolchains
-- add support for static toolchains
+- hash-style=gnu for non-mips and non-musl
+- socat openssl flavour + update
 - add fb full screen logo
-- qemu-system-mips64el memory alloc probs
 - port opkg with gpg signing
 - restart network (kill wpa_supplicant)
 - essid with spaces
diff --git a/mk/build.mk b/mk/build.mk
index 90fce65a8..3108ec064 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -145,7 +145,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
 
 world:
 	mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
-		$(PACKAGE_DIR) $(BIN_DIR) $(TOOLS_BUILD_DIR) \
+		$(PACKAGE_DIR) $(TOOLS_BUILD_DIR) $(STAGING_HOST_DIR)/usr/bin \
 		$(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
 	${BASH} ${TOPDIR}/scripts/update-sys
diff --git a/tools/Makefile b/tools/Makefile
index 2ffa4971c..5331dbd8c 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,7 +3,7 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=adk mkcrypt cpio bc bzip2 m4 xz
+TARGETS:=adk mkcrypt cpio flex bc bzip2 m4 xz
 
 ifeq ($(ADK_HOST_NEED_GENEXT2FS),y)
 TARGETS+=genext2fs
diff --git a/tools/flex/Makefile b/tools/flex/Makefile
new file mode 100644
index 000000000..fc357d250
--- /dev/null
+++ b/tools/flex/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		flex
+PKG_VERSION:=		2.5.35
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		201d3f38758d95436cbc64903386de0b
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
+
+include ../rules.mk
+
+install: ${STAGING_HOST_DIR}/usr/bin/flex
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	(cd ${WRKBUILD}; ./configure)
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}'
+	touch $@
+
+${STAGING_HOST_DIR}/usr/bin/flex: $(WRKBUILD)/.compiled
+	$(INSTALL_BIN) $(WRKBUILD)/flex \
+		${STAGING_HOST_DIR}/usr/bin
+
+include $(TOPDIR)/mk/tools.mk
-- 
cgit v1.2.3