aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-01-17 16:58:41 -0800
committerKhem Raj <raj.khem@gmail.com>2023-01-21 10:02:01 -0800
commited9fd245a9336dfc095d3c14b265df5f8e7fc467 (patch)
tree0ab2c6339937fb83836bdcca8272ef3e2e9ab09d
parenta56f11b144b5d69b6355bb22ffd4ab326199cf9d (diff)
downloadmeta-openembedded-contrib-ed9fd245a9336dfc095d3c14b265df5f8e7fc467.tar.gz
satyr: Fix build with musl
Add missing typedefs for __compar_fn_t and compare_fn_t for non __GLIBC__ case. Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch24
1 files changed, 11 insertions, 13 deletions
diff --git a/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch b/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch
index b6c32c4bd5..24efc13560 100644
--- a/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch
+++ b/meta-oe/recipes-support/satyr/files/0002-fix-compile-failure-against-musl-C-library.patch
@@ -10,19 +10,17 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
lib/rpm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/lib/rpm.c b/lib/rpm.c
-index 920e145..58140bf 100644
--- a/lib/rpm.c
+++ b/lib/rpm.c
-@@ -191,7 +191,7 @@ sr_rpm_package_sort(struct sr_rpm_package *packages)
- }
+@@ -34,6 +34,11 @@
+ #include <assert.h>
+ #include <string.h>
- /* Sort the array. */
-- qsort(array, count, sizeof(struct sr_rpm_package*), (comparison_fn_t)cmp_nevra_qsort_wrapper);
-+ qsort(array, count, sizeof(struct sr_rpm_package*), cmp_nevra_qsort_wrapper);
-
- /* Create a linked list from the sorted array. */
- for (size_t loop = 0; loop < count; ++loop)
---
-2.8.1
-
++#if !defined(__GLIBC__)
++typedef int (*__compar_fn_t) (const void*, const void*);
++typedef __compar_fn_t comparison_fn_t;
++#endif
++
+ struct sr_rpm_package *
+ sr_rpm_package_new()
+ {