zbar: enable static build

libv4l supports static build since commit f837251785 (package/libv4l:
allow build of v4l2 utilities on noMMU platforms).

Cc: Volkov Viacheslav <sv99@inbox.ru>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Baruch Siach 2018-01-23 14:43:45 +02:00 committed by Peter Korsgaard
parent b94c8cf7ca
commit fc4a6abfa6

View file

@ -2,7 +2,6 @@ config BR2_PACKAGE_ZBAR
bool "zbar" bool "zbar"
depends on BR2_TOOLCHAIN_HAS_THREADS # libv4l depends on BR2_TOOLCHAIN_HAS_THREADS # libv4l
depends on BR2_USE_MMU # libv4l depends on BR2_USE_MMU # libv4l
depends on !BR2_STATIC_LIBS # libv4l
depends on BR2_INSTALL_LIBSTDCPP # libv4l depends on BR2_INSTALL_LIBSTDCPP # libv4l
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libv4l depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libv4l
select BR2_PACKAGE_JPEG select BR2_PACKAGE_JPEG
@ -12,7 +11,7 @@ config BR2_PACKAGE_ZBAR
http://zbar.sourceforge.net/ http://zbar.sourceforge.net/
comment "zbar needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0" comment "zbar needs a toolchain w/ threads, C++ and headers >= 3.0"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ depends on !BR2_TOOLCHAIN_HAS_THREADS \
|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0