wvstreams: not available for static only builds

Also propagated to wvdial as it selects wvstreams.

Fixes:
 http://autobuild.buildroot.org/results/0cd/0cd5e0263b42e6845504d97688632e16206bd000/
 http://autobuild.buildroot.org/results/4e0/4e0ab461ea7ed7a288303741eec89156abd49864/

Signed-off-by: Gergely Imreh <imrehg@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/wvdial/Config.in b/package/wvdial/Config.in
index e57f9755f756db3c1f6312a282bca3de9a64fe81..5d415b1c798e2fa6680f3f1ccfa588f07d1338ca 100644 (file)
--- a/package/wvdial/Config.in
+++ b/package/wvdial/Config.in
@@ -2,12 +2,13 @@ config BR2_PACKAGE_WVDIAL
        bool "wvdial"
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_MMU # wvstreams
+       depends on !BR2_STATIC_LIBS # wvstreams
        select BR2_PACKAGE_WVSTREAMS
        help
          wvdial is an intelligent Point-to-Point Protocol dialer
 
          http://wvdial.googlecode.com/
 
-comment "wvdial needs a toolchain w/ C++"
+comment "wvdial needs a toolchain w/ C++, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_INSTALL_LIBSTDCPP
+       depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS

diff --git a/package/wvstreams/Config.in b/package/wvstreams/Config.in
index 3080dc71ef258ce834a4651dbb48051c02bf3276..0cbe60aff6dff818aa562704e16b4e7e9a81c960 100644 (file)
--- a/package/wvstreams/Config.in
+++ b/package/wvstreams/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_WVSTREAMS
        bool "wvstreams"
        depends on BR2_INSTALL_LIBSTDCPP
+       depends on !BR2_STATIC_LIBS
        depends on BR2_USE_MMU # fork()
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_ZLIB
@@ -9,6 +10,6 @@ config BR2_PACKAGE_WVSTREAMS
 
          http://wvstreams.googlecode.com/
 
-comment "wvstreams needs a toolchain w/ C++"
+comment "wvstreams needs a toolchain w/ C++, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_INSTALL_LIBSTDCPP
+       depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS