Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 59 insertions, 3 deletions

diff --git a/tools/Makefile b/tools/Makefile
index 2d29372dc..cdbf2b4f1 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,7 +3,7 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=adk mkcrypt cpio m4 flex bc bzip2 xz
+TARGETS:=adk mksh mkcrypt cpio m4 flex bc bzip2 xz
 
 ifeq ($(ADK_HOST_NEED_GENEXT2FS),y)
 TARGETS+=genext2fs
@@ -29,6 +29,9 @@ endif
 ifeq ($(ADK_HOST_NEED_LZMA),y)
 TARGETS+=lzma
 endif
+ifeq ($(ADK_HOST_NEED_CCACHE),y)
+TARGETS+=ccache
+endif
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
diff --git a/tools/adk/depmaker.c b/tools/adk/depmaker.c
index 572baa392..e5028003b 100644
--- a/tools/adk/depmaker.c
+++ b/tools/adk/depmaker.c
@@ -166,7 +166,6 @@ int main() {
 			
 			/* exclude manual maintained packages from package/Makefile */
 			if (
-				!(strncmp(pkgdirp->d_name, "libc", 4) == 0 && strlen(pkgdirp->d_name) == 4) &&
 				!(strncmp(pkgdirp->d_name, "libpthread", 10) == 0 && strlen(pkgdirp->d_name) == 10) &&
 				!(strncmp(pkgdirp->d_name, "uclibc++", 8) == 0) &&
 				!(strncmp(pkgdirp->d_name, "uclibc", 6) == 0) &&
diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile
new file mode 100644
index 000000000..fde838067
--- /dev/null
+++ b/tools/ccache/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:=		ccache
+PKG_VERSION:=		3.1.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a5e9954b1dae036762f7b13673a2cf76
+PKG_SITES:=		http://samba.org/ftp/ccache/
+
+include ../rules.mk
+
+install: ${STAGING_HOST_DIR}/usr/bin/ccache
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	(cd ${WRKBUILD}; ./configure --prefix=$(STAGING_HOST_DIR)/usr)
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}'
+	touch $@
+
+${STAGING_HOST_DIR}/usr/bin/ccache: $(WRKBUILD)/.compiled
+	$(INSTALL_BIN) $(WRKBUILD)/ccache \
+		${STAGING_HOST_DIR}/usr/bin
+
+include $(TOPDIR)/mk/tools.mk
diff --git a/tools/m4/Makefile b/tools/m4/Makefile
index 996132510..f4a1bae1a 100644
--- a/tools/m4/Makefile
+++ b/tools/m4/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		m4
 PKG_VERSION:=		1.4.17
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a5e9954b1dae036762f7b13673a2cf76
-PKG_SITES:=		http://www.gnu.org/software/m4/
+PKG_SITES:=		${MASTER_SITE_GNU:=m4/}
 
 include ../rules.mk
 
diff --git a/tools/mksh/Makefile b/tools/mksh/Makefile
new file mode 100644
index 000000000..2c912e52b
--- /dev/null
+++ b/tools/mksh/Makefile
@@ -0,0 +1,29 @@
+# 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:=		mksh
+PKG_VERSION:=		49
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e8c205cac72c3dc8540bbc3897421422
+PKG_SITES:=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
+
+DISTFILES=		${PKG_NAME}-R${PKG_VERSION}.tgz
+WRKDIST=		${WRKDIR}/${PKG_NAME}
+
+include ../rules.mk
+
+install: ${STAGING_HOST_DIR}/usr/bin/mksh
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	cd ${WRKBUILD} && CC='${CC_FOR_BUILD}' CFLAGS='${CFLAGS_FOR_BUILD}' \
+	    HAVE_CAN_FSTACKPROTECTORALL=0 \
+	    TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -c lto
+	touch $@
+
+${STAGING_HOST_DIR}/usr/bin/mksh: $(WRKBUILD)/.compiled
+	${INSTALL_BIN} ${WRKBUILD}/mksh \
+		${STAGING_HOST_DIR}/usr/bin
+
+include $(TOPDIR)/mk/tools.mk