summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-23 20:23:58 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-23 20:23:58 +0200
commit50b0a6b559ac38c27e8d7aa60e743ce169ab3195 (patch)
tree3d3d899aa89cffe8943705d813ad1916d858d9be
parent0d932f42397abdd753da75baba4d65be18fa491e (diff)
always build c++ compiler
-rw-r--r--adk/tools/pkgmaker.c19
-rw-r--r--package/xbmc/Makefile1
-rw-r--r--toolchain/gcc/Makefile6
3 files changed, 3 insertions, 23 deletions
diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c
index 04237462e..9958af8d5 100644
--- a/adk/tools/pkgmaker.c
+++ b/adk/tools/pkgmaker.c
@@ -322,7 +322,7 @@ int main() {
char *key, *value, *token, *cftoken, *sp, *hkey, *val, *pkg_fd;
char *pkg_name, *pkg_depends, *pkg_depends_system, *pkg_section, *pkg_descr, *pkg_url;
char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt;
- char *pkg_need_cxx, *pkg_need_java, *pkgname, *sysname, *pkg_debug;
+ char *pkg_need_cxx, *pkgname, *sysname, *pkg_debug;
char *pkg_libc_depends, *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name;
char *packages, *pkg_name_u, *pkgs, *pkg_opts, *pkg_libname;
char *saveptr, *p_ptr, *s_ptr, *pkg_helper, *sname, *sname2;
@@ -350,7 +350,6 @@ int main() {
pkg_dflt = NULL;
pkg_cfline = NULL;
pkg_need_cxx = NULL;
- pkg_need_java = NULL;
pkgname = NULL;
sysname = NULL;
pkg_helper = NULL;
@@ -557,8 +556,6 @@ int main() {
continue;
if ((parse_var(buf, "PKG_NEED_CXX", NULL, &pkg_need_cxx)) == 0)
continue;
- if ((parse_var(buf, "PKG_NEED_JAVA", NULL, &pkg_need_java)) == 0)
- continue;
if ((parse_var(buf, "PKG_DEPENDS", pkg_depends, &pkg_depends)) == 0)
continue;
if ((parse_var_with_system(buf, "PKG_DEPENDS_", pkg_depends_system, &pkg_depends_system, &sysname, 12)) == 0)
@@ -730,11 +727,6 @@ 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");
- }
-
/* save token in pkg_debug */
pkg_debug = strdup(token);
fprintf(cfg, "config ADK_PACKAGE_%s\n", toupperstr(token));
@@ -894,14 +886,6 @@ int main() {
pkg_depends_system = NULL;
}
- if (pkg_need_cxx != NULL) {
- fprintf(cfg, "\tdepends on ADK_TOOLCHAIN_GCC_CXX\n");
- }
- if (pkg_need_java != NULL) {
- fprintf(cfg, "\tdepends on ADK_TOOLCHAIN_GCC_JAVA\n");
- pkg_need_java = NULL;
- }
-
fprintf(cfg, "\tselect ADK_COMPILE_%s\n", toupperstr(pkgdirp->d_name));
if (pkg_dflt != NULL) {
@@ -1161,7 +1145,6 @@ int main() {
packages = NULL;
pkg_need_cxx = NULL;
- pkg_need_java = NULL;
/* reset flags, free memory */
free(pkg_name);
free(pkg_libname);
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile
index 0ec863a83..f3482d82a 100644
--- a/package/xbmc/Makefile
+++ b/package/xbmc/Makefile
@@ -30,6 +30,7 @@ PKG_BUILDDEP+= swig-host sdl-host sdl-image-host liblzo-host
PKG_URL:= http://xbmc.org/
#PKG_SITES:= http://mirrors.xbmc.org/releases/source/
PKG_SITES:= http://openadk.org/distfiles/
+PKG_NEED_CXX:= 1
PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc
PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 1268fa216..9d9215811 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -119,10 +119,7 @@ ifeq (${ADK_MAKE_PARALLEL},y)
GCC_MAKEOPTS+= -j${ADK_MAKE_JOBS}
endif
-LANGUAGES:=c
-ifeq ($(ADK_TOOLCHAIN_GCC_CXX),y)
-LANGUAGES:=${LANGUAGES},c++
-endif
+LANGUAGES:=c,c++
include ${TOPDIR}/mk/buildhlp.mk
@@ -181,7 +178,6 @@ $(GCC_BUILD_DIR_INITIAL)/.configured:
--with-sysroot=$(STAGING_TARGET_DIR)
touch $@
-
$(GCC_BUILD_DIR_INITIAL)/.compiled: $(GCC_BUILD_DIR_INITIAL)/.configured
PATH='$(TARGET_PATH)' $(MAKE) ${GCC_MAKEOPTS} -C $(GCC_BUILD_DIR_INITIAL) all-gcc all-target-libgcc
touch $@