diff options
author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-09-16 01:41:04 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-09-16 07:10:03 -0700 |
commit | 1e27ab301fd807a696321a5a550cfcc93ccbe9ea (patch) | |
tree | 259a339f5935a1fb20a6a515b6fb0cc6031fef0d /meta-oe/recipes-extended | |
parent | f9164a19aef5536558c535bbe650354d173e5f7b (diff) | |
download | meta-openembedded-1e27ab301fd807a696321a5a550cfcc93ccbe9ea.tar.gz |
zlog: update to 1.2.14
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
-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_1.2.14.bb (renamed from meta-oe/recipes-extended/zlog/zlog_git.bb) | 8 |
2 files changed, 2 insertions, 38 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 deleted file mode 100644 index 71a989103..000000000 --- a/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
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_1.2.14.bb index de7516457..b94664c33 100644 --- a/meta-oe/recipes-extended/zlog/zlog_git.bb +++ b/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb | |||
@@ -3,12 +3,8 @@ HOMEPAGE = "https://github.com/HardySimpson/zlog" | |||
3 | LICENSE = "LGPLv2.1" | 3 | LICENSE = "LGPLv2.1" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
5 | 5 | ||
6 | PV = "1.2.12+git${SRCPV}" | 6 | SRCREV = "8fc78c3c65cb705953a2f3f9a813c3ef3c8b2270" |
7 | 7 | SRC_URI = "git://github.com/HardySimpson/zlog" | |
8 | SRCREV = "13904dab2878aa2654d0c20fb8600a3dc5f2dd68" | ||
9 | SRC_URI = "git://github.com/HardySimpson/zlog \ | ||
10 | file://0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch \ | ||
11 | " | ||
12 | 8 | ||
13 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
14 | 10 | ||