diff options
author | Joe Slater <joe.slater@windriver.com> | 2023-08-22 15:28:00 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-29 09:41:07 +0100 |
commit | 3cffa34a9c36fd65558b26f3e9832b4b96941377 (patch) | |
tree | 1102ce1a46077a62515dd0d4e7b1458e32c87e4b /meta/recipes-devtools/file | |
parent | 68e468b3e9be94218b8ab71e5a69b7cfa71d1c0a (diff) | |
download | poky-3cffa34a9c36fd65558b26f3e9832b4b96941377.tar.gz |
file: fix call to localtime_r()
Depending on the version of glibc, localtime_r() must
be preceded by a call to tzset() or it will ignore any
value of TZ in the environment. This problem will only
be seen when building file-native on outdated hosts.
(From OE-Core rev: 791145f3064d7807630d3591b9e7c7b2dc37152c)
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/file')
-rw-r--r-- | meta/recipes-devtools/file/file_5.45.bb | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/file/files/print_c.patch | 27 |
2 files changed, 30 insertions, 1 deletions
diff --git a/meta/recipes-devtools/file/file_5.45.bb b/meta/recipes-devtools/file/file_5.45.bb index a7127023cb..8477668658 100644 --- a/meta/recipes-devtools/file/file_5.45.bb +++ b/meta/recipes-devtools/file/file_5.45.bb | |||
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdd | |||
11 | DEPENDS = "file-replacement-native" | 11 | DEPENDS = "file-replacement-native" |
12 | DEPENDS:class-native = "bzip2-replacement-native" | 12 | DEPENDS:class-native = "bzip2-replacement-native" |
13 | 13 | ||
14 | SRC_URI = "git://github.com/file/file.git;branch=master;protocol=https" | 14 | SRC_URI = "git://github.com/file/file.git;branch=master;protocol=https \ |
15 | file://print_c.patch \ | ||
16 | " | ||
15 | 17 | ||
16 | SRCREV = "4cbd5c8f0851201d203755b76cb66ba991ffd8be" | 18 | SRCREV = "4cbd5c8f0851201d203755b76cb66ba991ffd8be" |
17 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-devtools/file/files/print_c.patch b/meta/recipes-devtools/file/files/print_c.patch new file mode 100644 index 0000000000..760813f9c2 --- /dev/null +++ b/meta/recipes-devtools/file/files/print_c.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From e329257b8e22362b62e6c930447ef6feadd63f32 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joe Slater <joe.slater@windriver.com> | ||
3 | Date: Mon, 7 Aug 2023 22:37:19 +0000 | ||
4 | Subject: [PATCH] print.c: initialize timezone data for localtime_r() | ||
5 | |||
6 | The man page for localtime() points out that while it acts | ||
7 | like tzset() has been called, localtime_r() might not. We | ||
8 | have a local version of localtime_r() that avoids this, but | ||
9 | we do not compile it. | ||
10 | |||
11 | Upstream-Status: Submitted [file@astron.com] | ||
12 | |||
13 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
14 | --- | ||
15 | src/print.c | 1 + | ||
16 | 1 file changed, 1 insertion(+) | ||
17 | |||
18 | --- git.orig/src/print.c | ||
19 | +++ git/src/print.c | ||
20 | @@ -289,6 +289,7 @@ file_fmtdatetime(char *buf, size_t bsize | ||
21 | goto out; | ||
22 | |||
23 | if (flags & FILE_T_LOCAL) { | ||
24 | + tzset(); | ||
25 | tm = localtime_r(&t, &tmz); | ||
26 | } else { | ||
27 | tm = gmtime_r(&t, &tmz); | ||