summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2019-03-05 23:28:07 +0100
committerPeter Korsgaard <peter@korsgaard.com>2019-03-19 21:25:43 +0100
commit46c5ef2f17e0e0f7402b3d32f858aa9154e4ce15 (patch)
tree588c2fd381c71178866de494bd15d60f3735f2ed
parentf66f97c2bcb4ca568466ad4c6e70d6f8bc689c2a (diff)
downloadbuildroot-46c5ef2f17e0e0f7402b3d32f858aa9154e4ce15.tar.gz
buildroot-46c5ef2f17e0e0f7402b3d32f858aa9154e4ce15.zip
package/gst-plugins-bad: allow static build of zbar plugin
zbar can be built statically since commit fc4a6abfa6bbffeabefb9967dbf378c410fb6318 so remove the dynamic library dependency from BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit ec9b3aec53f55fd1aca99c42f737afafdf912a7f) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/gstreamer/gst-plugins-bad/Config.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/package/gstreamer/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in
index f45981f6c8..fe8457f6d2 100644
--- a/package/gstreamer/gst-plugins-bad/Config.in
+++ b/package/gstreamer/gst-plugins-bad/Config.in
@@ -324,14 +324,13 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR
bool "zbar"
depends on BR2_TOOLCHAIN_HAS_THREADS # zbar-> libv4l
depends on BR2_USE_MMU # zbar-> libv4l
- depends on !BR2_STATIC_LIBS # zbar-> libv4l
depends on BR2_INSTALL_LIBSTDCPP # zbar-> libv4l
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # zbar
select BR2_PACKAGE_ZBAR
-comment "zbar plugin needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.17"
+comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.17"
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_17
endif
OpenPOWER on IntegriCloud