diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-04-21 12:28:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-23 10:12:08 +0100 |
commit | 972888296cf425f1e6771a175561ef755e95197f (patch) | |
tree | 374b5170fc4cdf082417198ffd6f7c243d780d9b /meta/recipes-devtools/elfutils | |
parent | 2cd3d10d36a44d87612d6cf8563bd1dbecad5250 (diff) | |
download | poky-972888296cf425f1e6771a175561ef755e95197f.tar.gz |
elfutils: Make 64bit time_t fix generic
Apply it always since more than x32 needs it
(From OE-Core rev: faf5034876c319aa51d6b3e21265d0984566bb9e)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/elfutils')
-rw-r--r-- | meta/recipes-devtools/elfutils/elfutils_0.183.bb | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch | 32 |
2 files changed, 24 insertions, 12 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.183.bb b/meta/recipes-devtools/elfutils/elfutils_0.183.bb index 085b429540..be77730945 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.183.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.183.bb | |||
@@ -22,6 +22,7 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ | |||
22 | file://ptest.patch \ | 22 | file://ptest.patch \ |
23 | file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ | 23 | file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ |
24 | file://0001-add-support-for-ipkg-to-debuginfod.cxx.patch \ | 24 | file://0001-add-support-for-ipkg-to-debuginfod.cxx.patch \ |
25 | file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \ | ||
25 | " | 26 | " |
26 | SRC_URI_append_libc-musl = " \ | 27 | SRC_URI_append_libc-musl = " \ |
27 | file://0002-musl-libs.patch \ | 28 | file://0002-musl-libs.patch \ |
@@ -29,9 +30,6 @@ SRC_URI_append_libc-musl = " \ | |||
29 | file://0004-Fix-error-on-musl.patch \ | 30 | file://0004-Fix-error-on-musl.patch \ |
30 | file://0015-config-eu.am-do-not-use-Werror.patch \ | 31 | file://0015-config-eu.am-do-not-use-Werror.patch \ |
31 | " | 32 | " |
32 | SRC_URI_append_x86-x32 = " \ | ||
33 | file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \ | ||
34 | " | ||
35 | SRC_URI[sha256sum] = "c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5" | 33 | SRC_URI[sha256sum] = "c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5" |
36 | 34 | ||
37 | inherit autotools gettext ptest pkgconfig | 35 | inherit autotools gettext ptest pkgconfig |
diff --git a/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch index a2737b9fe6..5bd6ba961c 100644 --- a/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch +++ b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch | |||
@@ -1,16 +1,27 @@ | |||
1 | From f4231bfbb61cd4962638766a7072f4295ed39150 Mon Sep 17 00:00:00 2001 | 1 | From 14dfe84943b8f9e6f504536d8735ef6356210b40 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 19 Apr 2021 23:29:10 +0200 | 3 | Date: Mon, 19 Apr 2021 23:29:10 +0200 |
4 | Subject: [PATCH] debuginfod/debuginfod-client.c: correct string format on x32 | 4 | Subject: [PATCH] debuginfod/debuginfod-client.c: correct string format on |
5 | 32bit arches with 64bit time_t | ||
6 | |||
7 | Use intmax_t to print time_t | ||
8 | |||
9 | time_t is platform dependent and some of architectures e.g. | ||
10 | x32, riscv32, arc use 64bit time_t even while they are 32bit | ||
11 | architectures, therefore directly using integer printf formats will not | ||
12 | work portably, use intmax_t to typecast time_t into printf family of | ||
13 | functions | ||
14 | |||
15 | Upstream-Status: Pending | ||
5 | 16 | ||
6 | Upstream-Status: Inappropriate [x32-specific; few, if any people care about it anymore] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 17 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | 19 | --- |
9 | debuginfod/debuginfod-client.c | 10 +++++----- | 20 | debuginfod/debuginfod-client.c | 10 +++++----- |
10 | 1 file changed, 5 insertions(+), 5 deletions(-) | 21 | 1 file changed, 5 insertions(+), 5 deletions(-) |
11 | 22 | ||
12 | diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c | 23 | diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c |
13 | index de26af5..a840f23 100644 | 24 | index de26af5..39e28f2 100644 |
14 | --- a/debuginfod/debuginfod-client.c | 25 | --- a/debuginfod/debuginfod-client.c |
15 | +++ b/debuginfod/debuginfod-client.c | 26 | +++ b/debuginfod/debuginfod-client.c |
16 | @@ -229,7 +229,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path) | 27 | @@ -229,7 +229,7 @@ debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path) |
@@ -18,7 +29,7 @@ index de26af5..a840f23 100644 | |||
18 | return -errno; | 29 | return -errno; |
19 | 30 | ||
20 | - if (dprintf(fd, "%ld", cache_clean_default_interval_s) < 0) | 31 | - if (dprintf(fd, "%ld", cache_clean_default_interval_s) < 0) |
21 | + if (dprintf(fd, "%lld", cache_clean_default_interval_s) < 0) | 32 | + if (dprintf(fd, "%jd", (intmax_t)cache_clean_default_interval_s) < 0) |
22 | return -errno; | 33 | return -errno; |
23 | 34 | ||
24 | /* init max age config file. */ | 35 | /* init max age config file. */ |
@@ -27,7 +38,7 @@ index de26af5..a840f23 100644 | |||
27 | return -errno; | 38 | return -errno; |
28 | 39 | ||
29 | - if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0) | 40 | - if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0) |
30 | + if (dprintf(fd, "%lld", cache_default_max_unused_age_s) < 0) | 41 | + if (dprintf(fd, "%jd", (intmax_t)cache_default_max_unused_age_s) < 0) |
31 | return -errno; | 42 | return -errno; |
32 | 43 | ||
33 | return 0; | 44 | return 0; |
@@ -36,7 +47,7 @@ index de26af5..a840f23 100644 | |||
36 | return -errno; | 47 | return -errno; |
37 | 48 | ||
38 | - int rc = fprintf(interval_file, "%ld", cache_clean_default_interval_s); | 49 | - int rc = fprintf(interval_file, "%ld", cache_clean_default_interval_s); |
39 | + int rc = fprintf(interval_file, "%lld", cache_clean_default_interval_s); | 50 | + int rc = fprintf(interval_file, "%jd", (intmax_t)cache_clean_default_interval_s); |
40 | fclose(interval_file); | 51 | fclose(interval_file); |
41 | 52 | ||
42 | if (rc < 0) | 53 | if (rc < 0) |
@@ -45,7 +56,7 @@ index de26af5..a840f23 100644 | |||
45 | if (interval_file) | 56 | if (interval_file) |
46 | { | 57 | { |
47 | - if (fscanf(interval_file, "%ld", &clean_interval) != 1) | 58 | - if (fscanf(interval_file, "%ld", &clean_interval) != 1) |
48 | + if (fscanf(interval_file, "%lld", &clean_interval) != 1) | 59 | + if (fscanf(interval_file, "%jd", (intmax_t*)(&clean_interval)) != 1) |
49 | clean_interval = cache_clean_default_interval_s; | 60 | clean_interval = cache_clean_default_interval_s; |
50 | fclose(interval_file); | 61 | fclose(interval_file); |
51 | } | 62 | } |
@@ -54,7 +65,10 @@ index de26af5..a840f23 100644 | |||
54 | if (max_unused_file) | 65 | if (max_unused_file) |
55 | { | 66 | { |
56 | - if (fscanf(max_unused_file, "%ld", &max_unused_age) != 1) | 67 | - if (fscanf(max_unused_file, "%ld", &max_unused_age) != 1) |
57 | + if (fscanf(max_unused_file, "%lld", &max_unused_age) != 1) | 68 | + if (fscanf(max_unused_file, "%jd", (intmax_t*)(&max_unused_age)) != 1) |
58 | max_unused_age = cache_default_max_unused_age_s; | 69 | max_unused_age = cache_default_max_unused_age_s; |
59 | fclose(max_unused_file); | 70 | fclose(max_unused_file); |
60 | } | 71 | } |
72 | -- | ||
73 | 2.31.1 | ||
74 | |||