diff mbox series

[RFC,v1,2/2] package/libv4l: enable v4l2-tracer

Message ID 20230329210000.7045-2-ps.report@gmx.net
State Superseded
Headers show
Series [v1,1/2] package/libv4l: bump version to 1.24.1 | expand

Commit Message

Peter Seiderer March 29, 2023, 9 p.m. UTC 
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Fails with rpi4_64 config:

    CXX      libv4l2tracer_la-libv4l2tracer.lo
  /tmp/ccXMMihl.s: Assembler messages:
  /tmp/ccXMMihl.s:208: Error: symbol `open64' is already defined
  /tmp/ccXMMihl.s:762: Error: symbol `mmap64' is already defined
  make[5]: *** [Makefile:751: libv4l2tracer_la-libv4l2tracer.lo] Error 1

Any hints how to fix this are welcome ;-)
---
 package/libv4l/Config.in | 1 +
 package/libv4l/libv4l.mk | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in
index c88f280c3b..7a86c7de15 100644
--- a/package/libv4l/Config.in
+++ b/package/libv4l/Config.in
@@ -33,6 +33,7 @@  config BR2_PACKAGE_LIBV4L_UTILS
 	  - v4l2-compliance
 	  - v4l2-ctl, cx18-ctl, ivtv-ctl
 	  - v4l2-sysfs-path
+	  - v4l2-tracer (if json-c is enabled)
 	  - rds-ctl
 	  - qv4l2 (if Qt is enabled)
 
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index 83f9dfe565..ca2eccc5a6 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -9,7 +9,7 @@  LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
 LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils
 LIBV4L_INSTALL_STAGING = YES
 LIBV4L_DEPENDENCIES = host-pkgconf
-LIBV4L_CONF_OPTS = --disable-doxygen-doc --disable-qvidcap --disable-v4l-tracer
+LIBV4L_CONF_OPTS = --disable-doxygen-doc --disable-qvidcap
 # needed to get utils/qv4l link flags right
 LIBV4L_AUTORECONF = YES
 # add host-gettext for AM_ICONV macro
@@ -66,6 +66,13 @@  LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11"
 # libelf and clang support
 LIBV4L_CONF_OPTS += --disable-bpf
 
+ifeq ($(BR2_PACKAGE_JSON_C),y)
+LIBV4L_CONF_OPTS += --enable-v4l-tracer
+LIBV4L_DEPENDENCIES += json-c
+else
+LIBV4L_CONF_OPTS += --disable-v4l-tracer
+endif
+
 ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy)
 LIBV4L_CONF_OPTS += --enable-qv4l2
 LIBV4L_DEPENDENCIES += qt5base