From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 05 Aug 2024 08:59:45 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sarh3-006PLf-21 for lore@lore.pengutronix.de; Mon, 05 Aug 2024 08:59:45 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sarh2-0004Rc-Js; Mon, 05 Aug 2024 08:59:44 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sarXi-0004EN-Nh; Mon, 05 Aug 2024 08:50:06 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sarXi-004eDG-Ak; Mon, 05 Aug 2024 08:50:06 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sarXi-003jwU-0v; Mon, 05 Aug 2024 08:50:06 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 5 Aug 2024 08:50:06 +0200 Message-Id: <20240805065006.891579-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240726120033.3557075-2-p.zabel@pengutronix.de> References: <20240726120033.3557075-2-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] v4l-utils: allow (partial) build with Y2038 support X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 9b8be2197db8a762707256ba8f5ebcad7d6e38ca. Michael [sent from post-receive hook] On Mon, 05 Aug 2024 08:50:06 +0200, Philipp Zabel wrote: > 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 > Message-Id: <20240726120033.3557075-2-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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