diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-06-29 16:20:31 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-06-30 18:25:26 -0300 |
| commit | cc5505ba8485ff6d541816a4f176e57e8fb70fcd (patch) | |
| tree | 9fb974f2dc293a7e5afd584291f58cd4250b3a0c /community/ostree/musl-fixes.patch | |
| parent | e531a086fdfecba154aa2bd457019c4a74ebfa9a (diff) | |
| download | aports-cc5505ba8485ff6d541816a4f176e57e8fb70fcd.tar.bz2 aports-cc5505ba8485ff6d541816a4f176e57e8fb70fcd.tar.xz | |
community/ostree: upgrade to 2019.2
Diffstat (limited to 'community/ostree/musl-fixes.patch')
| -rw-r--r-- | community/ostree/musl-fixes.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/community/ostree/musl-fixes.patch b/community/ostree/musl-fixes.patch index ce4a5e6dfb..69eea3efb8 100644 --- a/community/ostree/musl-fixes.patch +++ b/community/ostree/musl-fixes.patch @@ -16,3 +16,70 @@ +#endif + + +diff --git a/libglnx/glnx-dirfd.h b/libglnx/glnx-dirfd.h +index 0046ac8..79b9f6a 100644 +--- a/libglnx/glnx-dirfd.h ++++ b/libglnx/glnx-dirfd.h +@@ -28,6 +28,16 @@ + #include <sys/stat.h> + #include <fcntl.h> + ++/* 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 ++ + G_BEGIN_DECLS + + /** + +diff --git a/libglnx/glnx-fdio.h b/libglnx/glnx-fdio.h +index c0a7cc1..8f72920 100644 +--- a/libglnx/glnx-fdio.h ++++ b/libglnx/glnx-fdio.h +@@ -35,6 +35,17 @@ + #include <glnx-macros.h> + #include <glnx-errors.h> + ++/* 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 ++ ++ + G_BEGIN_DECLS + + /* Irritatingly, g_basename() which is what we want + +diff --git a/libglnx/glnx-xattrs.c b/libglnx/glnx-xattrs.c +index 79a14cd..ebb96d4 100644 +--- a/libglnx/glnx-xattrs.c ++++ b/libglnx/glnx-xattrs.c +@@ -28,6 +28,16 @@ + #include <glnx-errors.h> + #include <glnx-local-alloc.h> + ++/* 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 ++ + static GVariant * + variant_new_ay_bytes (GBytes *bytes) + { + |