Browse Source

libsndfile: needs c++, autoselect c++ toolchain option

Waldemar Brodkorb 7 years ago
parent
commit
96a2bfae97
4 changed files with 9 additions and 2 deletions
  1. 3 1
      adk/tools/pkgmaker.c
  2. 4 0
      mk/build.mk
  3. 1 1
      package/findutils/Makefile
  4. 1 0
      package/libsndfile/Makefile

+ 3 - 1
adk/tools/pkgmaker.c

@@ -893,8 +893,10 @@ int main() {
 							fprintf(cfg, "\tselect ADK_PACKAGE_LIBPTHREAD\n");
 						if (strncmp(token, "rt", 2) == 0)
 							fprintf(cfg, "\tselect ADK_PACKAGE_LIBRT\n");
-						if (strncmp(token, "c++", 3) == 0)
+						if (strncmp(token, "c++", 3) == 0) {
+							fprintf(cfg, "\tselect ADK_TOOLCHAIN_WITH_CXX\n");
 							fprintf(cfg, "\tselect ADK_PACKAGE_LIBSTDCXX\n");
+						}
 						if (strncmp(token, "mmu", 3) == 0)
 							fprintf(cfg, "\tdepends on ADK_TARGET_WITH_MMU\n");
 						token = strtok(NULL, " ");

+ 4 - 0
mk/build.mk

@@ -118,6 +118,10 @@ POSTCONFIG=		-@\
 			touch .rebuild.dropbear .rebuild.openssh;\
 			rebuild=1;\
 		fi; \
+		if [ "$$(grep ^ADK_TOOLCHAIN_WITH .config|md5sum)" != "$$(grep ^ADK_TOOLCHAIN_WITH .config.old|md5sum)" ];then \
+			cleandir=1;\
+			rebuild=1;\
+		fi; \
 		if [ "$$(grep ^ADK_TARGET_KERNEL_VERSION .config|md5sum)" != "$$(grep ^ADK_TARGET_KERNEL_VERSION .config.old|md5sum)" ];then \
 			cleandir=1;\
 			rebuild=1;\

+ 1 - 1
package/findutils/Makefile

@@ -10,7 +10,7 @@ PKG_HASH:=		ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
 PKG_DESCR:=		utilities for finding files
 PKG_SECTION:=		base/apps
 HOST_BUILDDEP:=		bison-host
-PKG_NEEDS:=		treads
+PKG_NEEDS:=		threads
 PKG_URL:=		http://www.gnu.org/software/findutils/
 PKG_SITES:=		http://ftp.gnu.org/pub/gnu/findutils/
 PKG_BB:=		1

+ 1 - 0
package/libsndfile/Makefile

@@ -11,6 +11,7 @@ PKG_DESCR:=		reading and writing files containing sampled sound
 PKG_SECTION:=		libs/audio
 PKG_URL:=		http://www.mega-nerd.com/libsndfile/
 PKG_SITES:=		http://www.mega-nerd.com/libsndfile/files/
+PKG_NEEDS:=		c++
 PKG_OPTS:=		dev
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz