From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH 2/2] v4l-utils: allow (partial) build with Y2038 support
Date: Fri, 26 Jul 2024 14:00:33 +0200 [thread overview]
Message-ID: <20240726120033.3557075-2-p.zabel@pengutronix.de> (raw)
In-Reply-To: <20240726120033.3557075-1-p.zabel@pengutronix.de>
The v4l-wrappers and v4l2-tracer options don't play nice with Y2038
support. Add a new option for v4l-wrappers and make both depend on
GLIBC_Y2038 being disabled.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/v4l-utils.in | 9 ++++++++-
rules/v4l-utils.make | 4 +++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in
index 8bbd12f47166..bb444213b7b0 100644
--- a/rules/v4l-utils.in
+++ b/rules/v4l-utils.in
@@ -25,9 +25,15 @@ config V4L_UTILS_LIBV4L1
config V4L_UTILS_LIBV4L2
bool
- select V4L_UTILS_LIBV4LCONVERT
prompt "install libv4l2"
+config V4L_UTILS_V4L2CONVERT
+ bool
+ select V4L_UTILS_LIBV4L2
+ select V4L_UTILS_LIBV4LCONVERT
+ depends on !GLIBC_Y2038
+ prompt "install v4l2convert"
+
config V4L_UTILS_LIBV4LCONVERT
bool
prompt "install libv4lconvert"
@@ -93,6 +99,7 @@ config V4L_UTILS_V4L2SYSFSPATH
config V4L_UTILS_TRACER
bool
+ depends on !GLIBC_Y2038
prompt "install v4l2-tracer"
endif
diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
index a532e6900f5d..8911fccc12ee 100644
--- a/rules/v4l-utils.make
+++ b/rules/v4l-utils.make
@@ -52,7 +52,7 @@ V4L_UTILS_CONF_OPT := \
-Dudevdir=/usr/lib/udev \
-Dv4l-plugins=true \
-Dv4l-utils=true \
- -Dv4l-wrappers=true \
+ -Dv4l-wrappers=$(call ptx/truefalse, PTXCONF_V4L_UTILS_V4L2CONVERT) \
-Dv4l2-compliance-32=false \
-Dv4l2-compliance-libv4l=true \
-Dv4l2-ctl-32=false \
@@ -84,8 +84,10 @@ ifdef PTXCONF_V4L_UTILS_LIBV4L1
endif
ifdef PTXCONF_V4L_UTILS_LIBV4L2
@$(call install_lib, v4l-utils, 0, 0, 0644, libv4l2)
+ifdef PTXCONF_V4L_UTILS_V4L2CONVERT
@$(call install_lib, v4l-utils, 0, 0, 0644, libv4l/v4l2convert)
endif
+endif
ifdef PTXCONF_V4L_UTILS_LIBV4LCONVERT
@$(call install_lib, v4l-utils, 0, 0, 0644, libv4lconvert)
endif
--
2.39.2
next prev parent reply other threads:[~2024-07-26 12:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-26 12:00 [ptxdist] [PATCH 1/2] v4l-utils: version bump 1.26.0 -> 1.28.1 Philipp Zabel
2024-07-26 12:00 ` Philipp Zabel [this message]
2024-08-05 6:50 ` [ptxdist] [APPLIED] v4l-utils: allow (partial) build with Y2038 support Michael Olbrich
2024-08-05 6:50 ` [ptxdist] [APPLIED] v4l-utils: version bump 1.26.0 -> 1.28.1 Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240726120033.3557075-2-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox