diff options
| -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 @@ | |||
| 1 | From b97f62fdf3b78eb5cfcb3a1b12c6fd62f735717b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 15 Jul 2017 09:29:33 -0700 | ||
| 4 | Subject: [PATCH] event.c: Cast pthread_t to unsigned long instead of unsigned | ||
| 5 | int | ||
| 6 | |||
| 7 | On 64bit machines it ends up in errors | ||
| 8 | |||
| 9 | event.c:85:67: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] | ||
| 10 | a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); | ||
| 11 | |||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | src/event.c | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | diff --git a/src/event.c b/src/event.c | ||
| 18 | index 8f988b5..c632c33 100644 | ||
| 19 | --- a/src/event.c | ||
| 20 | +++ b/src/event.c | ||
| 21 | @@ -82,7 +82,7 @@ zlog_event_t *zlog_event_new(int time_cache_count) | ||
| 22 | a_event->tid = pthread_self(); | ||
| 23 | |||
| 24 | a_event->tid_str_len = sprintf(a_event->tid_str, "%lu", (unsigned long)a_event->tid); | ||
| 25 | - a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%x", (unsigned int)a_event->tid); | ||
| 26 | + a_event->tid_hex_str_len = sprintf(a_event->tid_hex_str, "0x%lu", (unsigned long)a_event->tid); | ||
| 27 | |||
| 28 | //zlog_event_profile(a_event, ZC_DEBUG); | ||
| 29 | return a_event; | ||
| 30 | -- | ||
| 31 | 2.13.3 | ||
| 32 | |||
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" | |||
| 6 | PV = "1.2.12+git${SRCPV}" | 6 | PV = "1.2.12+git${SRCPV}" |
| 7 | 7 | ||
| 8 | SRCREV = "13904dab2878aa2654d0c20fb8600a3dc5f2dd68" | 8 | SRCREV = "13904dab2878aa2654d0c20fb8600a3dc5f2dd68" |
| 9 | SRC_URI = "git://github.com/HardySimpson/zlog" | 9 | SRC_URI = "git://github.com/HardySimpson/zlog \ |
| 10 | file://0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch \ | ||
| 11 | " | ||
| 10 | 12 | ||
| 11 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
| 12 | 14 | ||
