diff options
Diffstat (limited to 'meta/recipes-extended/libtirpc/libtirpc')
-rw-r--r-- | meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch | 34 | ||||
-rw-r--r-- | meta/recipes-extended/libtirpc/libtirpc/musl.patch | 30 |
2 files changed, 34 insertions, 30 deletions
diff --git a/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch b/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch new file mode 100644 index 0000000000..3797cdf521 --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Rosen Penev <rosenp@gmail.com> | ||
3 | Date: Tue, 21 Jan 2020 11:51:16 -0500 | ||
4 | Subject: [PATCH] xdr_float: do not include bits/endian.h | ||
5 | |||
6 | bits/endian.h is an internal header. endian.h should be included. | ||
7 | |||
8 | Fixes compilation with recent musl. | ||
9 | |||
10 | Signed-off-by: Rosen Penev <rosenp@gmail.com> | ||
11 | Signed-off-by: Steve Dickson <steved@redhat.com> | ||
12 | |||
13 | Upstream-Status: Backport [http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=d04f4d6f0e682f16b0ce96839ab4eadade591eb1] | ||
14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
15 | --- | ||
16 | src/xdr_float.c | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/src/xdr_float.c b/src/xdr_float.c | ||
20 | index 26bc865..349d48f 100644 | ||
21 | --- a/src/xdr_float.c | ||
22 | +++ b/src/xdr_float.c | ||
23 | @@ -83,7 +83,7 @@ static struct sgl_limits { | ||
24 | }; | ||
25 | #else | ||
26 | |||
27 | -#include <bits/endian.h> | ||
28 | +#include <endian.h> | ||
29 | #define IEEEFP | ||
30 | |||
31 | #endif /* vax */ | ||
32 | -- | ||
33 | 2.21.1 | ||
34 | |||
diff --git a/meta/recipes-extended/libtirpc/libtirpc/musl.patch b/meta/recipes-extended/libtirpc/libtirpc/musl.patch deleted file mode 100644 index 21cd9f9588..0000000000 --- a/meta/recipes-extended/libtirpc/libtirpc/musl.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | Consider musl provided built-in defines | ||
2 | |||
3 | Helps compile libtirpc with musl | ||
4 | bits/endian.h is not supposed to be included directly | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | --- a/tirpc/rpc/types.h | ||
10 | +++ b/tirpc/rpc/types.h | ||
11 | @@ -66,7 +66,7 @@ typedef int32_t rpc_inline_t; | ||
12 | #define mem_free(ptr, bsize) free(ptr) | ||
13 | |||
14 | |||
15 | -#if defined __APPLE_CC__ || defined __FreeBSD__ | ||
16 | +#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__) | ||
17 | # define __u_char_defined | ||
18 | # define __daddr_t_defined | ||
19 | #endif | ||
20 | --- a/src/xdr_float.c | ||
21 | +++ b/src/xdr_float.c | ||
22 | @@ -83,7 +83,7 @@ static struct sgl_limits { | ||
23 | }; | ||
24 | #else | ||
25 | |||
26 | -#include <bits/endian.h> | ||
27 | +#include <endian.h> | ||
28 | #define IEEEFP | ||
29 | |||
30 | #endif /* vax */ | ||