diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-07-17 20:10:03 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-24 18:58:50 +0200 |
| commit | b455bfd77f3587167eb67d86926c6a5c788e07fa (patch) | |
| tree | 105ad123746e26beefb147f22d9917d11a62e2a1 | |
| parent | 567e48cc76d0f383d95dfde55c9ce0a05a44993a (diff) | |
| download | meta-openembedded-contrib-b455bfd77f3587167eb67d86926c6a5c788e07fa.tar.gz | |
zlog: Fix build on 64bit targets and musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch | 32 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/zlog/zlog_git.bb | 4 |
2 files changed, 35 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch b/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch new file mode 100644 index 0000000000..71a989103e --- /dev/null +++ b/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch @@ -0,0 +1,32 @@ +From b97f62fdf3b78eb5cfcb3a1b12c6fd62f735717b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 15 Jul 2017 09:29:33 -0700 +Subject: [PATCH] event.c: Cast pthread_t to unsigned long instead of unsigned + int + +On 64bit machines it ends up in errors + +event.c:85:67: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/event.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/event.c b/src/event.c +index 8f988b5..c632c33 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -82,7 +82,7 @@ zlog_event_t *zlog_event_new(int time_cache_count) + a_event->tid = pthread_self(); + + a_event->tid_str_len = sprintf(a_event->tid_str, "%lu", (unsigned long)a_event->tid); +- a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); ++ a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%lu", (unsigned long)a_event->tid); + + //zlog_event_profile(a_event, ZC_DEBUG); + return a_event; +-- +2.13.3 + diff --git a/meta-oe/recipes-extended/zlog/zlog_git.bb b/meta-oe/recipes-extended/zlog/zlog_git.bb index 51c746fd32..86e6d30e22 100644 --- a/meta-oe/recipes-extended/zlog/zlog_git.bb +++ b/meta-oe/recipes-extended/zlog/zlog_git.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" PV = "1.2.12+git${SRCPV}" SRCREV = "13904dab2878aa2654d0c20fb8600a3dc5f2dd68" -SRC_URI = "git://github.com/HardySimpson/zlog" +SRC_URI = "git://github.com/HardySimpson/zlog \ + file://0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch \ + " S = "${WORKDIR}/git" |