diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in index 57ddde1dfb..c88f280c3b 100644 --- a/package/libv4l/Config.in +++ b/package/libv4l/Config.in @@ -20,6 +20,7 @@ comment "libv4l JPEG support not enabled" config BR2_PACKAGE_LIBV4L_UTILS bool "v4l-utils tools" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 help v4l-utils is a collection of various video4linux and DVB utilities. @@ -35,6 +36,9 @@ config BR2_PACKAGE_LIBV4L_UTILS - rds-ctl - qv4l2 (if Qt is enabled) +comment "v4l-utils tools needs a toolchain w/ C++11" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + endif comment "libv4l needs a toolchain w/ threads, C++ and headers >= 3.0" diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index 4dc0f15f94..8300f5c970 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -59,6 +59,9 @@ ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) LIBV4L_CONF_OPTS += --enable-v4l-utils LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) +# v4l2-ctl needs c++11, use gnu++11 for typeof support +LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" + # IR BPF decoder support needs toolchain with linux-headers >= 3.18 # libelf and clang support LIBV4L_CONF_OPTS += --disable-bpf @@ -71,8 +74,6 @@ LIBV4L_CONF_ENV += \ ac_cv_prog_MOC=$(HOST_DIR)/bin/moc \ ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \ ac_cv_prog_UIC=$(HOST_DIR)/bin/uic -# qt5 needs c++11 (since qt-5.7)/use gnu++11 for typeof support -LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" else LIBV4L_CONF_OPTS += --disable-qv4l2 endif