summaryrefslogtreecommitdiff
path: root/dev-util/flatpak-builder/files/flatpak-builder-1.2.2-musl.patch
blob: 626fbddd03523b6fd0a0af7eb0fcb1d9c9002f27 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
diff --git a/subprojects/debugedit/tools/debugedit.c b/subprojects/debugedit/tools/debugedit.c
index 668777a..b3ba5cb 100644
--- a/subprojects/debugedit/tools/debugedit.c
+++ b/subprojects/debugedit/tools/debugedit.c
@@ -25,7 +25,11 @@
 #include <byteswap.h>
 #include <endian.h>
 #include <errno.h>
+#ifdef __GLIBC__
 #include <error.h>
+#else
+#include "error.h"
+#endif
 #include <limits.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/subprojects/debugedit/tools/error.h b/subprojects/debugedit/tools/error.h
new file mode 100644
index 0000000..c330dc3
--- /dev/null
+++ b/subprojects/debugedit/tools/error.h
@@ -0,0 +1,26 @@
+#ifndef _ERROR_H
+#define _ERROR_H
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+static unsigned int error_message_count = 0;
+
+static inline void error(int status, int errnum, const char* format, ...)
+{
+  va_list ap;
+  fprintf(stderr, "%s: ", program_invocation_name);
+  va_start(ap, format);
+  vfprintf(stderr, format, ap);
+  va_end(ap);
+  if (errnum)
+    fprintf(stderr, ": %s", strerror(errnum));
+  fprintf(stderr, "\n");
+  error_message_count++;
+  if (status)
+    exit(status);
+}
+
+#endif
diff --git a/subprojects/libglnx/glnx-macros.h b/subprojects/libglnx/glnx-macros.h
index 6d8aca9..e3e4e33 100644
--- a/subprojects/libglnx/glnx-macros.h
+++ b/subprojects/libglnx/glnx-macros.h
@@ -28,6 +28,16 @@
 
 G_BEGIN_DECLS
 
+/* taken from glibc unistd.h and fixes musl */
+#ifndef TEMP_FAILURE_RETRY
+#define TEMP_FAILURE_RETRY(expression) \
+  (__extension__                                                              \
+    ({ long int __result;                                                     \
+       do __result = (long int) (expression);                                 \
+       while (__result == -1L && errno == EINTR);                             \
+       __result; }))
+#endif
+
 /* All of these are for C only. */
 #ifndef __GI_SCANNER__