blob: 1b2f9ed98b240067bb07b04d662b71b76da578ed [file] [log] [blame]
Andrew Geissler82c905d2020-04-13 13:39:40 -05001From 7ff8cbecde7455b530fa7894a78d2326799f2556 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 1 May 2019 22:15:03 +0100
4Subject: [PATCH 4/4] 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
13Upstream-Status: Inappropriate [workaround in musl]
14
15Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
16
17---
18 tests/elfstrmerge.c | 5 +++++
19 1 file changed, 5 insertions(+)
20
21diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c
22index ba0d68d..1d2447f 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;
37--
382.17.1
39