On Tue, Apr 20, 2021 at 10:34 AM Alexander Kanavin <[email protected]> wrote: > > Then the patch needs to guard %lld only for those architectures, and I am not > sure how to do that. >
look into using intmax_t type for representing these variables and use %jd in printf formatting string > Alex > > On Tue, 20 Apr 2021 at 17:59, Khem Raj <[email protected]> wrote: >> >> >> >> On 4/20/21 5:05 AM, Alexander Kanavin wrote: >> > Signed-off-by: Alexander Kanavin <[email protected]> >> > --- >> > .../elfutils/elfutils_0.183.bb | 3 + >> > ...infod-client.c-correct-string-format.patch | 60 +++++++++++++++++++ >> > 2 files changed, 63 insertions(+) >> > create mode 100644 >> > meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch >> > >> > diff --git a/meta/recipes-devtools/elfutils/elfutils_0.183.bb >> > b/meta/recipes-devtools/elfutils/elfutils_0.183.bb >> > index 8b1dece200..a4ea8da32e 100644 >> > --- a/meta/recipes-devtools/elfutils/elfutils_0.183.bb >> > +++ b/meta/recipes-devtools/elfutils/elfutils_0.183.bb >> > @@ -29,6 +29,9 @@ SRC_URI_append_libc-musl = " \ >> > file://0004-Fix-error-on-musl.patch \ >> > file://0015-config-eu.am-do-not-use-Werror.patch \ >> > " >> > +SRC_URI_append_x86-x32 = " \ >> > + >> > file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \ >> > + " >> > SRC_URI[sha256sum] = >> > "c3637c208d309d58714a51e61e63f1958808fead882e9b607506a29e5474f2c5" >> > >> > 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 >> > new file mode 100644 >> > index 0000000000..a2737b9fe6 >> > --- /dev/null >> > +++ >> > b/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch >> > @@ -0,0 +1,60 @@ >> > +From f4231bfbb61cd4962638766a7072f4295ed39150 Mon Sep 17 00:00:00 2001 >> > +From: Alexander Kanavin <[email protected]> >> > +Date: Mon, 19 Apr 2021 23:29:10 +0200 >> > +Subject: [PATCH] debuginfod/debuginfod-client.c: correct string format on >> > x32 >> > + >> > +Upstream-Status: Inappropriate [x32-specific; few, if any people care >> > about it anymore] >> >> This is worth upstreaming, since 32 bit architectures with 64bit time_t >> will need. >> >> > +Signed-off-by: Alexander Kanavin <[email protected]> >> > +--- >> > + debuginfod/debuginfod-client.c | 10 +++++----- >> > + 1 file changed, 5 insertions(+), 5 deletions(-) >> > + >> > +diff --git a/debuginfod/debuginfod-client.c >> > b/debuginfod/debuginfod-client.c >> > +index de26af5..a840f23 100644 >> > +--- a/debuginfod/debuginfod-client.c >> > ++++ b/debuginfod/debuginfod-client.c >> > +@@ -229,7 +229,7 @@ debuginfod_init_cache (char *cache_path, char >> > *interval_path, char *maxage_path) >> > + if (fd < 0) >> > + return -errno; >> > + >> > +- if (dprintf(fd, "%ld", cache_clean_default_interval_s) < 0) >> > ++ if (dprintf(fd, "%lld", cache_clean_default_interval_s) < 0) >> > + return -errno; >> > + >> > + /* init max age config file. */ >> > +@@ -237,7 +237,7 @@ debuginfod_init_cache (char *cache_path, char >> > *interval_path, char *maxage_path) >> > + && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0) >> > + return -errno; >> > + >> > +- if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0) >> > ++ if (dprintf(fd, "%lld", cache_default_max_unused_age_s) < 0) >> > + return -errno; >> > + >> > + return 0; >> > +@@ -263,7 +263,7 @@ debuginfod_clean_cache(debuginfod_client *c, >> > + if (interval_file == NULL) >> > + return -errno; >> > + >> > +- int rc = fprintf(interval_file, "%ld", >> > cache_clean_default_interval_s); >> > ++ int rc = fprintf(interval_file, "%lld", >> > cache_clean_default_interval_s); >> > + fclose(interval_file); >> > + >> > + if (rc < 0) >> > +@@ -275,7 +275,7 @@ debuginfod_clean_cache(debuginfod_client *c, >> > + interval_file = fopen(interval_path, "r"); >> > + if (interval_file) >> > + { >> > +- if (fscanf(interval_file, "%ld", &clean_interval) != 1) >> > ++ if (fscanf(interval_file, "%lld", &clean_interval) != 1) >> > + clean_interval = cache_clean_default_interval_s; >> > + fclose(interval_file); >> > + } >> > +@@ -291,7 +291,7 @@ debuginfod_clean_cache(debuginfod_client *c, >> > + max_unused_file = fopen(max_unused_path, "r"); >> > + if (max_unused_file) >> > + { >> > +- if (fscanf(max_unused_file, "%ld", &max_unused_age) != 1) >> > ++ if (fscanf(max_unused_file, "%lld", &max_unused_age) != 1) >> > + max_unused_age = cache_default_max_unused_age_s; >> > + fclose(max_unused_file); >> > + } >> > >> > >> > >> > >> >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#150718): https://lists.openembedded.org/g/openembedded-core/message/150718 Mute This Topic: https://lists.openembedded.org/mt/82232592/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
