浏览代码

flann: disallow static library build

Even though flann build system uses CMake, it always tries to build a
shared library, even if BUILD_SHARED_LIBS=OFF is passed. It could
probably be fixed in flann's CMakeLists.txt, but that's not really
worth the effort if upstream doesn't support it.

Therefore, we simply disallow the flann package in purely static
builds.

Fixes:

  http://autobuild.buildroot.org/results/a4e/a4ec0e9f28cd12ce770718fb407bbb4dc93b528b/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Thomas Petazzoni 11 年之前
父节点
当前提交
190b4e12b7
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      package/flann/Config.in

+ 3 - 2
package/flann/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_FLANN
 config BR2_PACKAGE_FLANN
 	bool "flann"
 	bool "flann"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_PREFER_STATIC_LIB
 	help
 	help
 	  FLANN is a library for performing fast approximate nearest
 	  FLANN is a library for performing fast approximate nearest
 	  neighbor searches in high dimensional spaces. It contains a
 	  neighbor searches in high dimensional spaces. It contains a
@@ -20,5 +21,5 @@ config BR2_PACKAGE_FLANN_EXAMPLES
 
 
 endif
 endif
 
 
-comment "flann needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "flann needs a toolchain w/ C++, dynamic library"
+	depends on !BR2_INSTALL_LIBSTDCPP || BR2_PREFER_STATIC_LIB