mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-04-20 11:38:34 +00:00
Code Issues Projects Releases Wiki Activity

ltrace: Fix build with clang

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2019-02-04 00:43:10 -08:00
parent cde3ede254
commit 1a502b3086
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
meta-oe/recipes-devtools/ltrace/ltrace/0001-hook-Do-not-append-int-to-std-string.patch Normal file
View File

@@ -0,0 +1,33 @@
From 8321f8b3befbaa355cfed988fdd8494133989676 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 4 Feb 2019 00:38:16 -0800
Subject: [PATCH] hook: Do not append int to std::string
Clang find this error
| ../../../git/sysdeps/linux-gnu/hooks.c:205:51: error: adding 'int' to a string does not append to the string [-Werror,-Wstring-plus
-int]
| || sprintf(syspath, "%s/%s", sysconfdir, FN + 1) < 0)
| ~~~^~~
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
sysdeps/linux-gnu/hooks.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/sysdeps/linux-gnu/hooks.c
+++ b/sysdeps/linux-gnu/hooks.c
@@ -200,9 +200,10 @@ os_get_ltrace_conf_filenames(struct vect
const char *sysconfdir = SYSCONFDIR;
if (sysconfdir != NULL && *sysconfdir != '\0') {
/* No +1, we skip the initial period. */
- syspath = malloc(strlen(sysconfdir) + sizeof FN);
+ syspath = malloc(strlen(sysconfdir) + sizeof FN + 1);
+ syspath[strlen(sysconfdir) + sizeof FN + 1] = '\0';
if (syspath == NULL
- || sprintf(syspath, "%s/%s", sysconfdir, FN + 1) < 0)
+ || sprintf(syspath, "%s/%s", sysconfdir, FN) < 0)
goto fail;
}

1
meta-oe/recipes-devtools/ltrace/ltrace_git.bb
View File

@@ -26,6 +26,7 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http
file://0001-configure-Recognise-linux-musl-as-a-host-OS.patch \
file://0001-mips-plt.c-Delete-include-error.h.patch \
file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \
file://0001-hook-Do-not-append-int-to-std-string.patch \
"
S = "${WORKDIR}/git"