diff options
author | Tim Orling <timothy.t.orling@linux.intel.com> | 2018-01-21 16:12:15 -0800 |
---|---|---|
committer | Tim Orling <timothy.t.orling@linux.intel.com> | 2018-01-21 16:12:15 -0800 |
commit | 00cd20b9f75de5a0161633a651a27e702cb211d2 (patch) | |
tree | 05de6b58103f06197a4e572df0b3576a8a15b306 /meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch | |
parent | 3328211afdef8ffb00dd4dff1143959d5412b075 (diff) | |
download | openembedded-core-contrib-00cd20b9f75de5a0161633a651a27e702cb211d2.tar.gz |
systemd-bootchart: upgrade to v233; fix build with musltimo/systemd-bootchart
* Drop xlocale.h patch, merged upstream
* Rework patches from systemd to fix musl build
- comparison_fn_t is glibc specific
- musl does not provide printf.h
- musl does not provide canonicalize_file_name
Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch')
-rw-r--r-- | meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch new file mode 100644 index 0000000000..f392ceafcc --- /dev/null +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch @@ -0,0 +1,36 @@ +From 45b401a947af944c20b3c451a35dfe53bca5ef3b Mon Sep 17 00:00:00 2001 +From: Tim Orling <timothy.t.orling@linux.intel.com> +Date: Thu, 28 Dec 2017 21:24:57 -0800 +Subject: [PATCH 1/3] comparison_fn_t is glibc specific, use raw signature in + function pointer + +Make it work with musl where comparison_fn_t is not provided + +Reuse the approach from systemd: +systemd/0013-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch + +Based on work by: Khem Raj <raj.khem@gmail.com> + +Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> +--- +Upstream-Status: Pending + + src/util.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util.h b/src/util.h +index 561f9e7..e9cfd81 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -57,7 +57,7 @@ extern char **saved_argv; + * Normal qsort requires base to be nonnull. Here were require + * that only if nmemb > 0. + */ +-static inline void qsort_safe(void *base, size_t nmemb, size_t size, comparison_fn_t compar) { ++static inline void qsort_safe(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)) { + if (nmemb <= 1) + return; + +-- +2.13.6 + |