diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-11-24 09:08:10 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-25 21:55:10 +0000 |
| commit | 5185608b6012f8fcf5945a7b3e11b1a22376c0a3 (patch) | |
| tree | 552a48622d18b438807974e706b8135adf58d36b /meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch | |
| parent | 8259247df2138957fac720222aaa0396fa5eea69 (diff) | |
| download | poky-5185608b6012f8fcf5945a7b3e11b1a22376c0a3.tar.gz | |
elfutils: update 0.185 -> 0.186
Drop glibc-2.34-fix.patch merged upstream.
Rework support for error() on non-glibc targets:
upstream now provides its own implementation, so we can drop
the patch that adds ours; said implementation isn't
build-tested with tests, so ptest has to be disabled on musl.
This, in turns, allows dropping 0004-Fix-error-on-musl.patch.
License-Update: copyright years
(From OE-Core rev: 9c51ae20c0e4c0d3e7161fc6b51fca078dbf014a)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch')
| -rw-r--r-- | meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch b/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch deleted file mode 100644 index 2fa60c333c..0000000000 --- a/meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 1 | From 72819106d0e5666d172d39c24c19e4e7a3b8be0e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
| 3 | Date: Wed, 1 May 2019 22:15:03 +0100 | ||
| 4 | Subject: [PATCH] Fix error on musl: | ||
| 5 | |||
| 6 | | ../../elfutils-0.176/tests/elfstrmerge.c: In function 'main': | ||
| 7 | | ../../elfutils-0.176/tests/elfstrmerge.c:370:60: error: 'ALLPERMS' undeclared (first use in this function); did you mean 'EPERM'? | ||
| 8 | | fdnew = open (fnew, O_WRONLY | O_CREAT, st.st_mode & ALLPERMS); | ||
| 9 | | ^~~~~~~~ | ||
| 10 | | EPERM | ||
| 11 | | ../../elfutils-0.176/tests/elfstrmerge.c:370:60: note: each undeclared identifier is reported only once for each function it appears in | ||
| 12 | |||
| 13 | Upstream-Status: Inappropriate [workaround in musl] | ||
| 14 | |||
| 15 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
| 16 | |||
| 17 | --- | ||
| 18 | tests/elfstrmerge.c | 5 +++++ | ||
| 19 | 1 file changed, 5 insertions(+) | ||
| 20 | |||
| 21 | diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c | ||
| 22 | index 197c6a5..3683672 100644 | ||
| 23 | --- a/tests/elfstrmerge.c | ||
| 24 | +++ b/tests/elfstrmerge.c | ||
| 25 | @@ -33,6 +33,11 @@ | ||
| 26 | #include ELFUTILS_HEADER(dwelf) | ||
| 27 | #include "elf-knowledge.h" | ||
| 28 | |||
| 29 | +/* for musl */ | ||
| 30 | +#ifndef ALLPERMS | ||
| 31 | +# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */ | ||
| 32 | +#endif | ||
| 33 | + | ||
| 34 | /* The original ELF file. */ | ||
| 35 | static int fd = -1; | ||
| 36 | static Elf *elf = NULL; | ||
