blob: f41dde0e164b70a42cbb6ad47440cb9b381f0e66 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
From 5aabd01e415374fc97eebe80d4635c3bae728f81 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"
Upstream-Status: Backport [https://github.com/gjasny/v4l-utils/commit/d517cfdcdc16533ab7e06e97c07ca089cf261aef]
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.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.34.1
|
