summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2020-01-23 14:27:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-04 15:56:29 +0000
commit32f9d3b56f4cf194783bfc7a369cce327b53cc08 (patch)
tree42d5a380f35351c595e524f1a67cc3f9a81323f1 /meta
parentb3bfb6452907b4617e14d8fa20c36e08855efbdd (diff)
downloadpoky-32f9d3b56f4cf194783bfc7a369cce327b53cc08.tar.gz
libtirpc: upgrade 1.1.4 -> 1.2.5
Drop musl patch and backport a fix from upstream instead. (From OE-Core rev: 009dbec9058bf43e63eeabdd24ecad990bf22568) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch34
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc/musl.patch30
-rw-r--r--meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb (renamed from meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb)6
3 files changed, 37 insertions, 33 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 @@
1From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001
2From: Rosen Penev <rosenp@gmail.com>
3Date: Tue, 21 Jan 2020 11:51:16 -0500
4Subject: [PATCH] xdr_float: do not include bits/endian.h
5
6bits/endian.h is an internal header. endian.h should be included.
7
8Fixes compilation with recent musl.
9
10Signed-off-by: Rosen Penev <rosenp@gmail.com>
11Signed-off-by: Steve Dickson <steved@redhat.com>
12
13Upstream-Status: Backport [http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=d04f4d6f0e682f16b0ce96839ab4eadade591eb1]
14Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
15---
16 src/xdr_float.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/xdr_float.c b/src/xdr_float.c
20index 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--
332.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 @@
1Consider musl provided built-in defines
2
3Helps compile libtirpc with musl
4bits/endian.h is not supposed to be included directly
5
6Upstream-Status: Pending
7Signed-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 */
diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb
index 53ed5e81f7..fc66821ecc 100644
--- a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
+++ b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb
@@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \
10PROVIDES = "virtual/librpc" 10PROVIDES = "virtual/librpc"
11 11
12SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ 12SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
13 file://musl.patch \ 13 file://0001-xdr_float-do-not-include-bits-endian.h.patch \
14 " 14 "
15UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" 15UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/"
16UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" 16UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
17SRC_URI[md5sum] = "f5d2a623e9dfbd818d2f3f3a4a878e3a" 17SRC_URI[md5sum] = "688787ddff7c6a92ef15ae3f5dc4dfa1"
18SRC_URI[sha256sum] = "2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d" 18SRC_URI[sha256sum] = "f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca"
19 19
20inherit autotools pkgconfig 20inherit autotools pkgconfig
21 21