diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-09-26 15:00:19 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-28 12:37:46 +0100 |
commit | 4e79ddf67876b4784c9eb38fb7fb1d12cc1b3cec (patch) | |
tree | 1a5ca450c3f3b4872d66d8fece8c411fd4b0ec7e /meta/recipes-devtools | |
parent | 085adb197bb73d81ba49c6128c634609d69dd191 (diff) | |
download | poky-4e79ddf67876b4784c9eb38fb7fb1d12cc1b3cec.tar.gz |
createrepo-c: Fix function declaration bug found with clang
clang is stricter about function parameter types in its functions and
errors out.
error: incompatible integer to pointer conversion initializing 'gchar *' (aka 'char *')
Real problem is in createrepo_c code where funciton definition and
declaration scopes are different
(From OE-Core rev: 1036bec2e99edd4c59ae1b6eedfbdc933104a9e4)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/createrepo-c/createrepo-c/0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch | 46 | ||||
-rw-r--r-- | meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb | 1 |
2 files changed, 47 insertions, 0 deletions
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch new file mode 100644 index 0000000000..ea768e06e6 --- /dev/null +++ b/meta/recipes-devtools/createrepo-c/createrepo-c/0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 5326969acc0c7e9e3cabca202154e4120c0d2c2f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 26 Sep 2023 14:52:11 -0700 | ||
4 | Subject: [PATCH] Move cr_compress_groupfile outside WITH_LIBMODULEMD | ||
5 | |||
6 | This function is used in code which is not conditional under WITH_LIBMODULEMD | ||
7 | therefore the declaration should also match its definition scope | ||
8 | |||
9 | Fixes build issues flagged by clang | ||
10 | |||
11 | src/createrepo_c.c:850:16: error: incompatible integer to pointer conversion initializing 'gchar *' (aka 'char *') with an | ||
12 | expression of type 'int' [-Wint-conversion] | ||
13 | | 850 | gchar *compressed_path = cr_compress_groupfile(cmd_options->groupfile_fullpath, tmp_out_repo, compression); | ||
14 | | | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
15 | |||
16 | Upstream-Status: Submitted [https://github.com/rpm-software-management/createrepo_c/pull/387] | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | --- | ||
19 | src/metadata_internal.h | 6 +++--- | ||
20 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
21 | |||
22 | diff --git a/src/metadata_internal.h b/src/metadata_internal.h | ||
23 | index 8ba0576..ecfbac2 100644 | ||
24 | --- a/src/metadata_internal.h | ||
25 | +++ b/src/metadata_internal.h | ||
26 | @@ -52,14 +52,14 @@ cr_metadata_load_modulemd(ModulemdModuleIndex **moduleindex, | ||
27 | * @param dest_dir Path to directory where the compressed groupfile should be stored. | ||
28 | * @return Path to the new compressed groupfile. Has to be freed by the caller. | ||
29 | */ | ||
30 | + | ||
31 | +#endif /* WITH_LIBMODULEMD */ | ||
32 | + | ||
33 | gchar * | ||
34 | cr_compress_groupfile(const char *groupfile, | ||
35 | const char *dest_dir, | ||
36 | cr_CompressionType compression); | ||
37 | |||
38 | - | ||
39 | -#endif /* WITH_LIBMODULEMD */ | ||
40 | - | ||
41 | #ifdef __cplusplus | ||
42 | } | ||
43 | #endif | ||
44 | -- | ||
45 | 2.42.0 | ||
46 | |||
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb index 9b109327c8..f4e65492f8 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_1.0.0.bb | |||
@@ -8,6 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;p | |||
8 | file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ | 8 | file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ |
9 | file://0001-include-rpm-rpmstring.h.patch \ | 9 | file://0001-include-rpm-rpmstring.h.patch \ |
10 | file://time64fix.patch \ | 10 | file://time64fix.patch \ |
11 | file://0001-Move-cr_compress_groupfile-outside-WITH_LIBMODULEMD.patch \ | ||
11 | " | 12 | " |
12 | 13 | ||
13 | SRCREV = "0cc13920991b2fb8f87fb9d352bd3394c2983289" | 14 | SRCREV = "0cc13920991b2fb8f87fb9d352bd3394c2983289" |