diff options
Diffstat (limited to 'poky/meta/recipes-devtools/elfutils')
-rw-r--r-- | poky/meta/recipes-devtools/elfutils/elfutils_0.183.bb | 9 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch | 74 |
2 files changed, 80 insertions, 3 deletions
diff --git a/poky/meta/recipes-devtools/elfutils/elfutils_0.183.bb b/poky/meta/recipes-devtools/elfutils/elfutils_0.183.bb index c0833686de..7aebaf1b6d 100644 --- a/poky/meta/recipes-devtools/elfutils/elfutils_0.183.bb +++ b/poky/meta/recipes-devtools/elfutils/elfutils_0.183.bb @@ -22,6 +22,7 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://ptest.patch \ file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \ file://0001-add-support-for-ipkg-to-debuginfod.cxx.patch \ + file://0001-debuginfod-debuginfod-client.c-correct-string-format.patch \ " SRC_URI_append_libc-musl = " \ file://0002-musl-libs.patch \ @@ -38,13 +39,13 @@ EXTRA_OECONF = "--program-prefix=eu-" DEPENDS_BZIP2 = "bzip2-replacement-native" DEPENDS_BZIP2_class-target = "bzip2" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'debuginfod', 'debuginfod libdebuginfod', '', d)}" PACKAGECONFIG[bzip2] = "--with-bzlib,--without-bzlib,${DEPENDS_BZIP2}" PACKAGECONFIG[xz] = "--with-lzma,--without-lzma,xz" PACKAGECONFIG[libdebuginfod] = "--enable-libdebuginfod,--disable-libdebuginfod,curl" PACKAGECONFIG[debuginfod] = "--enable-debuginfod,--disable-debuginfod,libarchive sqlite3 libmicrohttpd" -RDEPENDS_${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils" +RDEPENDS_${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils iproute2-ss bsdtar" EXTRA_OECONF_append_class-target = " --disable-tests-rpath" @@ -86,6 +87,7 @@ do_install_ptest() { cp -r ${B}/tests/* ${D}${PTEST_PATH}/tests cp -r ${B}/config.h ${D}${PTEST_PATH} cp -r ${B}/backends ${D}${PTEST_PATH} + cp -r ${B}/debuginfod ${D}${PTEST_PATH} sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile find ${D}${PTEST_PATH} -type f -name *.[hoc] | xargs -i rm {} fi @@ -142,6 +144,7 @@ INHIBIT_PACKAGE_STRIP_FILES = "\ ${PKGD}${PTEST_PATH}/tests/backtrace-data \ ${PKGD}${PTEST_PATH}/tests/backtrace-dwarf \ ${PKGD}${PTEST_PATH}/tests/deleted \ + ${PKGD}${PTEST_PATH}/tests/dwfllines \ ${PKGD}${PTEST_PATH}/src/strip \ ${PKGD}${PTEST_PATH}/src/addr2line \ ${PKGD}${PTEST_PATH}/src/elfcmp \ @@ -159,4 +162,4 @@ INHIBIT_PACKAGE_STRIP_FILES = "\ ${PKGD}${PTEST_PATH}/backends/libebl_x86_64.so \ " -PRIVATE_LIBS_${PN}-ptest = "libdw.so.1 libelf.so.1 libasm.so.1" +PRIVATE_LIBS_${PN}-ptest = "libdw.so.1 libelf.so.1 libasm.so.1 libdebuginfod.so.1" diff --git a/poky/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch b/poky/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch new file mode 100644 index 0000000000..5bd6ba961c --- /dev/null +++ b/poky/meta/recipes-devtools/elfutils/files/0001-debuginfod-debuginfod-client.c-correct-string-format.patch @@ -0,0 +1,74 @@ +From 14dfe84943b8f9e6f504536d8735ef6356210b40 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 19 Apr 2021 23:29:10 +0200 +Subject: [PATCH] debuginfod/debuginfod-client.c: correct string format on + 32bit arches with 64bit time_t + +Use intmax_t to print time_t + +time_t is platform dependent and some of architectures e.g. +x32, riscv32, arc use 64bit time_t even while they are 32bit +architectures, therefore directly using integer printf formats will not +work portably, use intmax_t to typecast time_t into printf family of +functions + +Upstream-Status: Pending + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + 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..39e28f2 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, "%jd", (intmax_t)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, "%jd", (intmax_t)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, "%jd", (intmax_t)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, "%jd", (intmax_t*)(&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, "%jd", (intmax_t*)(&max_unused_age)) != 1) + max_unused_age = cache_default_max_unused_age_s; + fclose(max_unused_file); + } +-- +2.31.1 + |