summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/musl
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/musl')
-rw-r--r--meta/recipes-core/musl/musl/0001-unistd.h-Add-TEMP_FAILURE_RETRY.patch36
-rw-r--r--meta/recipes-core/musl/musl_git.bb1
2 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-core/musl/musl/0001-unistd.h-Add-TEMP_FAILURE_RETRY.patch b/meta/recipes-core/musl/musl/0001-unistd.h-Add-TEMP_FAILURE_RETRY.patch
deleted file mode 100644
index 4d48d61651..0000000000
--- a/meta/recipes-core/musl/musl/0001-unistd.h-Add-TEMP_FAILURE_RETRY.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 19cbebc3fa33c6a1a71a6036da4d67c98f859f06 Mon Sep 17 00:00:00 2001
2From: Adrian Bunk <bunk@stusta.de>
3Date: Wed, 15 May 2019 16:08:33 +0300
4Subject: unistd.h: Add TEMP_FAILURE_RETRY
5
6Signed-off-by: Adrian Bunk <bunk@stusta.de>
7Upstream-Status: Inappropriate [oe-specific]
8---
9 include/unistd.h | 11 +++++++++++
10 1 file changed, 11 insertions(+)
11
12diff --git a/include/unistd.h b/include/unistd.h
13index 9485da7a..8a75af57 100644
14--- a/include/unistd.h
15+++ b/include/unistd.h
16@@ -460,6 +460,17 @@ int eaccess(const char *, int);
17 #define _CS_V6_ENV 1148
18 #define _CS_V7_ENV 1149
19
20+#ifdef _GNU_SOURCE
21+#ifndef TEMP_FAILURE_RETRY
22+# define TEMP_FAILURE_RETRY(expression) \
23+ (__extension__ \
24+ ({ long int __result; \
25+ do __result = (long int) (expression); \
26+ while (__result == -1L && errno == EINTR); \
27+ __result; }))
28+#endif
29+#endif
30+
31 #ifdef __cplusplus
32 }
33 #endif
34--
352.20.1
36
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 2b433aed8c..1e324804e1 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -15,7 +15,6 @@ PV = "${BASEVER}+git${SRCPV}"
15SRC_URI = "git://git.musl-libc.org/musl \ 15SRC_URI = "git://git.musl-libc.org/musl \
16 file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ 16 file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
17 file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ 17 file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \
18 file://0001-unistd.h-Add-TEMP_FAILURE_RETRY.patch \
19 " 18 "
20 19
21S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"