diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-openembedded/meta-oe/recipes-extended/zlog | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-extended/zlog')
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch | 32 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb (renamed from external/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb) | 8 |
2 files changed, 2 insertions, 38 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch b/external/meta-openembedded/meta-oe/recipes-extended/zlog/zlog/0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch deleted file mode 100644 index 71a98910..00000000 --- a/external/meta-openembedded/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 @@ -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/external/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb b/external/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb index de751645..b94664c3 100644 --- a/external/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_git.bb +++ b/external/meta-openembedded/meta-oe/recipes-extended/zlog/zlog_1.2.14.bb @@ -3,12 +3,8 @@ HOMEPAGE = "https://github.com/HardySimpson/zlog" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -PV = "1.2.12+git${SRCPV}" - -SRCREV = "13904dab2878aa2654d0c20fb8600a3dc5f2dd68" -SRC_URI = "git://github.com/HardySimpson/zlog \ - file://0001-event.c-Cast-pthread_t-to-unsigned-long-instead-of-u.patch \ - " +SRCREV = "8fc78c3c65cb705953a2f3f9a813c3ef3c8b2270" +SRC_URI = "git://github.com/HardySimpson/zlog" S = "${WORKDIR}/git" |