summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-02 09:35:12 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-02 09:35:12 (GMT)
commitbc6ae3bd97162e25aff366acabbf80f096ccd8b7 (patch)
treed4c362e9c9aad370335a36414e1362e59052d6d1 /tools
parent4210ea9c8f69095fa0efaf5247f6c12925dcb4f0 (diff)
goodbye eglibc, see my blog http://blog.waldemar-brodkorb.de/
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile3
-rw-r--r--tools/adk/depmaker.c2
-rw-r--r--tools/adk/pkgmaker.c9
-rw-r--r--tools/gperf/Makefile25
4 files changed, 2 insertions, 37 deletions
diff --git a/tools/Makefile b/tools/Makefile
index d40f35f..2d29372 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -17,9 +17,6 @@ endif
ifeq ($(ADK_HOST_NEED_SYSLINUX),y)
TARGETS+=syslinux
endif
-ifeq ($(ADK_HOST_NEED_GPERF),y)
-TARGETS+=gperf
-endif
ifeq ($(ADK_HOST_NEED_JFFS2),y)
TARGETS+=mtd-utils
endif
diff --git a/tools/adk/depmaker.c b/tools/adk/depmaker.c
index f1483cc..572baa3 100644
--- a/tools/adk/depmaker.c
+++ b/tools/adk/depmaker.c
@@ -165,7 +165,7 @@ int main() {
}
/* exclude manual maintained packages from package/Makefile */
- if (!(strncmp(pkgdirp->d_name, "eglibc", 6) == 0) &&
+ 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) &&
diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c
index d2c444f..51d31aa 100644
--- a/tools/adk/pkgmaker.c
+++ b/tools/adk/pkgmaker.c
@@ -394,13 +394,6 @@ int main() {
fprintf(cfg, "\tdepends on ADK_TARGET_LIB_GLIBC\n");
fprintf(cfg, "\thelp\n");
fprintf(cfg, "\t GNU C library header files.\n\n");
- fprintf(cfg, "config ADK_PACKAGE_EGLIBC_DEV\n");
- fprintf(cfg, "\tprompt \"eglibc-dev........... development files for eglibc\"\n");
- fprintf(cfg, "\ttristate\n");
- fprintf(cfg, "\tdefault n\n");
- fprintf(cfg, "\tdepends on ADK_TARGET_LIB_EGLIBC\n");
- fprintf(cfg, "\thelp\n");
- fprintf(cfg, "\t GNU C library header files.\n\n");
fprintf(cfg, "config ADK_PACKAGE_UCLIBC_DEV\n");
fprintf(cfg, "\tprompt \"uclibc-dev........... development files for uclibc\"\n");
fprintf(cfg, "\ttristate\n");
@@ -873,7 +866,7 @@ int main() {
fprintf(cfg, "\nchoice\n");
fprintf(cfg, "prompt \"C++ library to use\"\n");
fprintf(cfg, "depends on ADK_COMPILE_%s\n\n", toupperstr(pkgdirp->d_name));
- fprintf(cfg, "default ADK_COMPILE_%s_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC\n", pkg_cxx);
+ fprintf(cfg, "default ADK_COMPILE_%s_WITH_STDCXX if ADK_TARGET_LIB_GLIBC\n", pkg_cxx);
fprintf(cfg, "default ADK_COMPILE_%s_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC\n\n", pkg_cxx);
fprintf(cfg, "config ADK_COMPILE_%s_WITH_STDCXX\n", pkg_cxx);
fprintf(cfg, "\tbool \"GNU C++ library\"\n");
diff --git a/tools/gperf/Makefile b/tools/gperf/Makefile
deleted file mode 100644
index 7f7d646..0000000
--- a/tools/gperf/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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:= gperf
-PKG_VERSION:= 3.0.4
-PKG_RELEASE:= 1
-PKG_MD5SUM:= c1f1db32fb6598d6a93e6e88796a8632
-PKG_SITES:= http://ftp.gnu.org/pub/gnu/gperf/
-
-include ../rules.mk
-
-install: ${STAGING_HOST_DIR}/usr/bin/gperf
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
- (cd ${WRKBUILD}; ./configure)
- ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}'
- touch $@
-
-${STAGING_HOST_DIR}/usr/bin/gperf: $(WRKBUILD)/.compiled
- $(INSTALL_BIN) $(WRKBUILD)/src/gperf \
- ${STAGING_HOST_DIR}/usr/bin
-
-include $(TOPDIR)/mk/tools.mk