diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2016-04-25 09:26:18 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-06 12:38:32 +0200 |
| commit | 831f710ecacc0cdc9b48d420a8ebefe029264174 (patch) | |
| tree | c65c5a67494828e05fa1bb005883d42b7bbae3b4 /meta-oe/recipes-devtools/ltrace | |
| parent | a61cb514258cbd0758ca575c0786ad6f651462ac (diff) | |
| download | meta-openembedded-contrib-831f710ecacc0cdc9b48d420a8ebefe029264174.tar.gz | |
ltrace: Remove deprecated readdir_r()
New glibc >= 2.24 will remove it
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/ltrace')
| -rw-r--r-- | meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch | 36 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/ltrace/ltrace_git.bb | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch b/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch new file mode 100644 index 0000000000..65c7d535eb --- /dev/null +++ b/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch @@ -0,0 +1,36 @@ +From 64f98f84fd88797e219f9dde1ca387fee4b509f0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 24 Apr 2016 16:58:17 -0700 +Subject: [PATCH] replace readdir_r with readdir + +glibc 2.24 has deprecated readdir_r + +https://sourceware.org/ml/libc-alpha/2016-02/msg00093.html + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + sysdeps/linux-gnu/proc.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c +index 953fd86..edb716d 100644 +--- a/sysdeps/linux-gnu/proc.c ++++ b/sysdeps/linux-gnu/proc.c +@@ -242,9 +242,10 @@ process_tasks(pid_t pid, pid_t **ret_tasks, size_t *ret_n) + size_t alloc = 0; + + while (1) { +- struct dirent entry; + struct dirent *result; +- if (readdir_r(d, &entry, &result) != 0) { ++ errno = 0; ++ result = readdir(d); ++ if (errno != 0) { + fail: + free(tasks); + closedir(d); +-- +2.8.0 + diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 19899f9bd5..c27e21dc89 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -17,6 +17,7 @@ DEPENDS = "elfutils" RDEPENDS_${PN} = "elfutils" SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=master \ file://configure-allow-to-disable-selinux-support.patch \ + file://0001-replace-readdir_r-with-readdir.patch \ " S = "${WORKDIR}/git" |