mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-10 00:04:06 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libv4l: backport upstream patch to fix time_t issue

Browse Source 
libv4l has some really special code that is built explicitly with
_FILE_OFFSET_BITS=32, which doesn't work with _TIME_BITS=64, causing
build failures when BR2_TIME_BITS_64=y. This build issue has been
fixed upstream. While how the upstream patch exactly works is unclear,
it's the patch that upstream has decided to implement to resolve the
build issue, so we simply backport it.

The issue exists since at least upstream commit
99f245f5e2826c7ae3ac8de530bc2fbd906eb62b, which was merged in
v4l-utils 1.26.0.

Fixes:

  https://autobuild.buildroot.org/results/616608ef2a44efff67fa21b3263b341da82744c4/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
[Julien: add upstream commit url in patch]
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Thomas Petazzoni
2025-04-14 14:19:22 +02:00
committed by Julien Olivain
parent 5c87c9aa0a
commit bdb5809adf
1 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
package/libv4l/0001-meson.build-fix-arm-_TIME_BITS-64-error.patch Normal file
View File

@@ -0,0 +1,37 @@
From 6faf5e963eadeab8b7d47d5b3c14f06e0ae1da01 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 12 Apr 2025 12:30:13 +0200
Subject: [PATCH] meson.build: fix arm _TIME_BITS=64 error
Undefine _TIME_BITS to avoid this error on 32-bit arm:
/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64"
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Upstream: https://git.linuxtv.org/v4l-utils.git/commit/?id=d517cfdcdc16533ab7e06e97c07ca089cf261aef
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 269a9da7..31927cda 100644
--- a/meson.build
+++ b/meson.build
@@ -53,8 +53,12 @@ v4l2_wrapper_args = [
# As the library needs to provide both 32-bit and 64-bit versions
# of file operations, disable transparent large file support (fixes
# 'Error: symbol `open64/mmap64' is already defined' compile failure
- # otherwise)
+ # otherwise).
+ #
+ # Also disable _TIME_BITS=64 since this is allowed only with
+ # _FILE_OFFSET_BITS=64, which is now 32.
'-U_FILE_OFFSET_BITS',
+ '-U_TIME_BITS',
'-D_FILE_OFFSET_BITS=32',
'-D_LARGEFILE64_SOURCE',
]
--
2.49.0