summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-11 17:16:55 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-11 17:16:55 (GMT)
commite435ddd4ee81da12e3e3e3d0433a90d539901839 (patch)
tree8822c0a9ab913f4267f4f8293a99b10a5839eb21
parent59f1e5ee4443e6210b148c58af56bef3e9a75f2b (diff)
add support for C++ packages, which need G++ compiler
-rw-r--r--package/dansguardian/Makefile1
-rw-r--r--package/gpsd/Makefile1
-rw-r--r--package/id3lib/Makefile1
-rw-r--r--package/iperf/Makefile1
-rw-r--r--package/mrd6/Makefile1
-rw-r--r--package/nmap/Makefile1
-rw-r--r--package/uclibc++/Config.in.manual4
-rw-r--r--package/uclibc++/Makefile1
-rw-r--r--tools/adk/pkgmaker.c15
9 files changed, 21 insertions, 5 deletions
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index 5cc1d08..e262bbc 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -13,6 +13,7 @@ PKG_DEPENDS:= libpcre zlib
PKG_BUILDDEP:= pcre zlib
PKG_URL:= http://dansguardian.org/
PKG_SITES:= http://dansguardian.org/downloads/2/Stable/
+PKG_NEED_CXX:= 1
PKG_CXX:= DANSGUARDIAN
include ${TOPDIR}/mk/package.mk
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index 83fac86..794d607 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -13,6 +13,7 @@ PKG_DEPENDS:= libpthread
PKG_BUILDDEP:= ncurses
PKG_SITES:= http://download.berlios.de/gpsd/
PKG_URL:= http://gpsd.berlios.de/
+PKG_NEED_CXX:= 1
PKG_CXX:= GPSD
PKG_SUBPKGS:= GPSD GPSD_CLIENTS
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index 17c92c1..63b31c5 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -13,6 +13,7 @@ PKG_DEPENDS:= zlib libiconv
PKG_BUILDDEP:= zlib libiconv
PKG_URL:= http://id3lib.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=id3lib/}
+PKG_NEED_CXX:= 1
PKG_CXX:= ID3LIB
include ${TOPDIR}/mk/package.mk
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index 7a4f709..57eda55 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:= net
PKG_DEPENDS:= libpthread
PKG_URL:= http://sourceforge.net/projects/iperf
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/}
+PKG_NEED_CXX:= 1
PKG_CXX:= IPERF
include ${TOPDIR}/mk/package.mk
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 745718a..5833d1f 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= IPv6 multicast routing daemon
PKG_SECTION:= ipv6
PKG_DEPENDS:= kmod-ipv6
PKG_SITES:= http://www.openadk.org/distfiles/
+PKG_NEED_CXX:= 1
PKG_CXX:= MRD6
WRKBUILD= ${WRKSRC}/src
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index 57f986e..0d645ff 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -13,6 +13,7 @@ PKG_DEPENDS:= libdnet libpcap libpcre
PKG_BUILDDEP:= libdnet libpcap pcre
PKG_URL:= http://nmap.org/
PKG_SITES:= http://download.insecure.org/nmap/dist/
+PKG_NEED_CXX:= 1
PKG_CXX:= NMAP
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/uclibc++/Config.in.manual b/package/uclibc++/Config.in.manual
index 50729fc..b645e03 100644
--- a/package/uclibc++/Config.in.manual
+++ b/package/uclibc++/Config.in.manual
@@ -1,7 +1,11 @@
+comment "uClibc++... C++ library for embedded systems (disabled, c++ missing)"
+depends on !ADK_TOOLCHAIN_GCC_CXX
+
config ADK_PACKAGE_UCLIBCXX
prompt "uClibc++............... C++ library for embedded systems"
tristate
depends on ADK_TARGET_LIB_UCLIBC
+ depends on ADK_TOOLCHAIN_GCC_CXX
default n
help
A standard C++ library for embedded systems
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 760258b..e718b20 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= A standard c++ library for embedded systems
PKG_SECTION:= libs
PKG_URL:= http://cxx.uclibc.org/
PKG_SITES:= http://cxx.uclibc.org/src/
+PKG_NEED_CXX:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c
index eeba003..e2b6e6e 100644
--- a/tools/adk/pkgmaker.c
+++ b/tools/adk/pkgmaker.c
@@ -508,8 +508,12 @@ int main() {
if (cfg == NULL)
perror("Can not open Config.in file");
+ if (pkg_need_cxx != NULL) {
+ fprintf(cfg, "comment \"%s... %s (disabled, c++ missing)\"\n", token, pkg_descr);
+ fprintf(cfg, "depends on !ADK_TOOLCHAIN_GCC_CXX\n\n");
+ }
fprintf(cfg, "config ADK_PACKAGE_%s\n", toupperstr(token));
- fprintf(cfg, "\tprompt \"%s... %s\"\n", pseudo_name, pkg_descr);
+ fprintf(cfg, "\tprompt \"%s. %s\"\n", pseudo_name, pkg_descr);
fprintf(cfg, "\ttristate\n");
if (pkg_multi != NULL)
if (strncmp(pkg_multi, "1", 1) == 0)
@@ -592,10 +596,11 @@ int main() {
}
if (pkg_need_cxx != NULL) {
- fprintf(cfg, "\tdepends on ADK_TOOLCHAIN_GCC_CXX");
+ fprintf(cfg, "\tdepends on ADK_TOOLCHAIN_GCC_CXX\n");
}
if (pkg_need_java != NULL) {
- fprintf(cfg, "\tdepends on ADK_TOOLCHAIN_GCC_JAVA");
+ fprintf(cfg, "\tdepends on ADK_TOOLCHAIN_GCC_JAVA\n");
+ pkg_need_java = NULL;
}
fprintf(cfg, "\tselect ADK_COMPILE_%s\n", toupperstr(pkgdirp->d_name));
@@ -712,6 +717,8 @@ int main() {
free(packages);
packages = NULL;
+ pkg_need_cxx = NULL;
+ pkg_need_java = NULL;
/* reset flags, free memory */
free(pkg_name);
free(pkg_descr);
@@ -724,8 +731,6 @@ int main() {
free(pkg_arch_depends);
free(pkg_host_depends);
free(pkg_cxx);
- free(pkg_need_cxx);
- free(pkg_need_java);
free(pkg_dflt);
free(pkg_cfline);
free(pkg_multi);