diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-09-07 01:41:03 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-07 17:48:32 +0100 |
| commit | d2dc07ebc9e38a7936c942b7c89caa67b654c587 (patch) | |
| tree | b47e9843785478318765232a02678fa4f32c535b | |
| parent | 9a16f9e4eb782e43c659832f551b7e50fa9c0486 (diff) | |
| download | openembedded-core-d2dc07ebc9e38a7936c942b7c89caa67b654c587.tar.gz openembedded-core-d2dc07ebc9e38a7936c942b7c89caa67b654c587.tar.bz2 openembedded-core-d2dc07ebc9e38a7936c942b7c89caa67b654c587.zip | |
sysprof: fix build with musl
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/sysprof/files/wordsize.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-kernel/sysprof/sysprof_3.30.0.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-kernel/sysprof/files/wordsize.patch b/meta/recipes-kernel/sysprof/files/wordsize.patch new file mode 100644 index 0000000000..d65b13a682 --- /dev/null +++ b/meta/recipes-kernel/sysprof/files/wordsize.patch @@ -0,0 +1,38 @@ +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/merge_requests/5] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From bc7e3e27c28d0bab8bea72f2314191532b2e7840 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Fri, 7 Sep 2018 01:30:09 +0100 +Subject: [PATCH] capture: use size of void* instead of glibc-specific + __WORDSIZE + +__WORDSIZE is glibc-specific so sp-capture-types.h doesn't work with musl. +--- + lib/capture/sp-capture-types.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/lib/capture/sp-capture-types.h b/lib/capture/sp-capture-types.h +index 48fcfb8..1d6cd1d 100644 +--- a/lib/capture/sp-capture-types.h ++++ b/lib/capture/sp-capture-types.h +@@ -32,12 +32,14 @@ G_BEGIN_DECLS + #define SP_CAPTURE_MAGIC (GUINT32_TO_LE(0xFDCA975E)) + #define SP_CAPTURE_ALIGN (sizeof(SpCaptureAddress)) + +-#if __WORDSIZE == 64 ++#if GLIB_SIZEOF_VOID_P == 8 + # define SP_CAPTURE_JITMAP_MARK G_GUINT64_CONSTANT(0xE000000000000000) + # define SP_CAPTURE_ADDRESS_FORMAT "0x%016lx" +-#else ++#elif GLIB_SIZEOF_VOID_P == 4 + # define SP_CAPTURE_JITMAP_MARK G_GUINT64_CONSTANT(0xE0000000) + # define SP_CAPTURE_ADDRESS_FORMAT "0x%016llx" ++#else ++#error Unknown GLIB_SIZEOF_VOID_P + #endif + + #define SP_CAPTURE_CURRENT_TIME (sp_clock_get_current_time()) +-- +2.11.0 + diff --git a/meta/recipes-kernel/sysprof/sysprof_3.30.0.bb b/meta/recipes-kernel/sysprof/sysprof_3.30.0.bb index 4f1b75017d..7783ab27f5 100644 --- a/meta/recipes-kernel/sysprof/sysprof_3.30.0.bb +++ b/meta/recipes-kernel/sysprof/sysprof_3.30.0.bb @@ -14,6 +14,7 @@ SRC_URI[archive.sha256sum] = "29cd2c4be277f00698dce48259219557c4fddc2c01254b8fac SRC_URI += " \ file://define-NT_GNU_BUILD_ID.patch \ file://0001-Do-not-build-anything-in-help-as-it-requires-itstool.patch \ + file://wordsize.patch \ " RECIPE_NO_UPDATE_REASON = "Waiting for resolution of https://bugzilla.gnome.org/show_bug.cgi?id=794625" |