summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2016-01-09 22:13:36 +0100
committerPeter Korsgaard <peter@korsgaard.com>2016-01-13 22:16:41 +0100
commitdbeb34f79786f61fd2010a1a2d1c3e06371f0b6d (patch)
treeb52e8f21cb776f649610bbba9dbcf8fc145d2aa0
parent57ce16aa27ab96efdcc6d95cfabd38fd20711990 (diff)
downloadbuildroot-dbeb34f79786f61fd2010a1a2d1c3e06371f0b6d.tar.gz
buildroot-dbeb34f79786f61fd2010a1a2d1c3e06371f0b6d.zip
package/vlc: disable for static-only builds
vlc configure errors out for a non-shared build: http://git.videolan.org/gitweb.cgi?p=vlc.git;a=blob;f=configure.ac;h=d44151b3fb507141ce7f9b98e95fa11edcdaac01;hb=HEAD#l450 Fixes http://autobuild.buildroot.net/results/f93/f93771b4f76b82197b930e6fde5eb7aebfe9c910/ http://autobuild.buildroot.net/results/4af/4af880a8a8a37efd57e12e18d43183ba49f5cbe0/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/vlc/Config.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/package/vlc/Config.in b/package/vlc/Config.in
index e2b8da9b55..03e85c3fca 100644
--- a/package/vlc/Config.in
+++ b/package/vlc/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_VLC
bool "vlc"
depends on (BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_NG || BR2_TOOLCHAIN_USES_GLIBC) # spawn.h
depends on BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_STATIC_LIBS
depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
@@ -31,7 +32,7 @@ config BR2_PACKAGE_VLC_OPENCV3_BACKEND
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT
-comment "vlc needs a uclibc snapshot, uclibc-ng or (e)glibc toolchain w/ C++, wchar, threads, headers >= 3.7"
+comment "vlc needs a uclibc snapshot, uclibc-ng or (e)glibc toolchain w/ C++, dynamic library, wchar, threads, headers >= 3.7"
depends on !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_NG || BR2_TOOLCHAIN_USES_GLIBC) \
- || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
+ || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_USE_WCHAR \
|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
OpenPOWER on IntegriCloud