From: Yoann Congal <[email protected]> This version of libcomps does wrong pointer assignment, and on GCC14 hosts (e.g. Fedora 41), this fails to build with: | build/tmp-glibc/work/x86_64-linux/libcomps-native/0.1.18-r0/git/libcomps/tests/check_parse.c:588:11: error: assignment to ‘COMPS_DocGroup *’ from incompatible pointer type ‘COMPS_DocCategory *’ [-Wincompatible-pointer-types] | 588 | g = (COMPS_DocCategory*)it->comps_obj;
Backport a patch making the assignment correct. Signed-off-by: Yoann Congal <[email protected]> --- ...orrect-variable-for-category-and-env.patch | 48 +++++++++++++++++++ .../libcomps/libcomps_0.1.18.bb | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/libcomps/libcomps/0001-Fix-build-use-correct-variable-for-category-and-env.patch diff --git a/meta/recipes-devtools/libcomps/libcomps/0001-Fix-build-use-correct-variable-for-category-and-env.patch b/meta/recipes-devtools/libcomps/libcomps/0001-Fix-build-use-correct-variable-for-category-and-env.patch new file mode 100644 index 00000000000..6d243064452 --- /dev/null +++ b/meta/recipes-devtools/libcomps/libcomps/0001-Fix-build-use-correct-variable-for-category-and-env.patch @@ -0,0 +1,48 @@ +From adcf4aaca08ea712af4b4e886931fd8ed59c7bf7 Mon Sep 17 00:00:00 2001 +From: Aleš Matěj <[email protected]> +Date: Tue, 2 Jan 2024 08:32:55 +0100 +Subject: [PATCH] Fix build: use correct variable for category and env +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: +- error: assignment to ‘COMPS_DocGroup *’ from incompatible pointer type ‘COMPS_DocCategory *’ +- error: assignment to ‘COMPS_DocGroup *’ from incompatible pointer type ‘COMPS_DocEnv *’ + +For: https://fedoraproject.org/wiki/Changes/PortingToModernC +(https://fedoraproject.org/wiki/Toolchain/PortingToModernC) +(https://gitlab.com/fweimer-rh/fedora-modernc-logs/-/blob/main/logs/l/libcomps.log) + +Upstream-Status: Backport [https://github.com/rpm-software-management/libcomps/commit/a71bce7e62990550a57688e51b14eb82d6de196b] +Signed-off-by: Yoann Congal <[email protected]> +--- + libcomps/tests/check_parse.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libcomps/tests/check_parse.c b/libcomps/tests/check_parse.c +index e5935e1..689cb98 100644 +--- a/libcomps/tests/check_parse.c ++++ b/libcomps/tests/check_parse.c +@@ -585,8 +585,8 @@ START_TEST(test_arch) + list = comps_doc_categories(doc2); + ck_assert(list->len == 2); + for (it = list->first, x=0; it != NULL; it = it->next, x++) { +- g = (COMPS_DocCategory*)it->comps_obj; +- str = (COMPS_Str*)comps_doccategory_get_id(g); ++ c = (COMPS_DocCategory*)it->comps_obj; ++ str = (COMPS_Str*)comps_doccategory_get_id(c); + ck_assert_msg(strcmp(str->val, cats[0][x]) == 0, "%s != %s", + str->val, cats[0][x]); + COMPS_OBJECT_DESTROY(str); +@@ -605,8 +605,8 @@ START_TEST(test_arch) + list = comps_doc_environments(doc2); + ck_assert(list->len == 2); + for (it = list->first, x=0; it != NULL; it = it->next, x++) { +- g = (COMPS_DocEnv*)it->comps_obj; +- str = (COMPS_Str*)comps_docenv_get_id(g); ++ e = (COMPS_DocEnv*)it->comps_obj; ++ str = (COMPS_Str*)comps_docenv_get_id(e); + ck_assert_msg(strcmp(str->val, envs[0][x]) == 0, "%s != %s", + str->val, envs[0][x]); + COMPS_OBJECT_DESTROY(str); diff --git a/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb index dd0a1f8f952..db6f3179626 100644 --- a/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb +++ b/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;protocol=https \ file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ + file://0001-Fix-build-use-correct-variable-for-category-and-env.patch \ " SRCREV = "dee4ae37f7818709802de28c4d16fa823bd83ae2"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#233238): https://lists.openembedded.org/g/openembedded-core/message/233238 Mute This Topic: https://lists.openembedded.org/mt/118341928/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
