From 009dbec9058bf43e63eeabdd24ecad990bf22568 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 23 Jan 2020 14:27:46 +0800 Subject: libtirpc: upgrade 1.1.4 -> 1.2.5 Drop musl patch and backport a fix from upstream instead. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...01-xdr_float-do-not-include-bits-endian.h.patch | 34 ++++++++++++++++++++++ meta/recipes-extended/libtirpc/libtirpc/musl.patch | 30 ------------------- meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb | 30 ------------------- meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb | 30 +++++++++++++++++++ 4 files changed, 64 insertions(+), 60 deletions(-) create mode 100644 meta/recipes-extended/libtirpc/libtirpc/0001-xdr_float-do-not-include-bits-endian.h.patch delete mode 100644 meta/recipes-extended/libtirpc/libtirpc/musl.patch delete mode 100644 meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb create mode 100644 meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb 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 @@ +From d04f4d6f0e682f16b0ce96839ab4eadade591eb1 Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Tue, 21 Jan 2020 11:51:16 -0500 +Subject: [PATCH] xdr_float: do not include bits/endian.h + +bits/endian.h is an internal header. endian.h should be included. + +Fixes compilation with recent musl. + +Signed-off-by: Rosen Penev +Signed-off-by: Steve Dickson + +Upstream-Status: Backport [http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=d04f4d6f0e682f16b0ce96839ab4eadade591eb1] +Signed-off-by: Anuj Mittal +--- + src/xdr_float.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/xdr_float.c b/src/xdr_float.c +index 26bc865..349d48f 100644 +--- a/src/xdr_float.c ++++ b/src/xdr_float.c +@@ -83,7 +83,7 @@ static struct sgl_limits { + }; + #else + +-#include ++#include + #define IEEEFP + + #endif /* vax */ +-- +2.21.1 + 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 @@ -Consider musl provided built-in defines - -Helps compile libtirpc with musl -bits/endian.h is not supposed to be included directly - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- a/tirpc/rpc/types.h -+++ b/tirpc/rpc/types.h -@@ -66,7 +66,7 @@ typedef int32_t rpc_inline_t; - #define mem_free(ptr, bsize) free(ptr) - - --#if defined __APPLE_CC__ || defined __FreeBSD__ -+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__) - # define __u_char_defined - # define __daddr_t_defined - #endif ---- a/src/xdr_float.c -+++ b/src/xdr_float.c -@@ -83,7 +83,7 @@ static struct sgl_limits { - }; - #else - --#include -+#include - #define IEEEFP - - #endif /* vax */ diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb b/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb deleted file mode 100644 index 53ed5e81f7..0000000000 --- a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Transport-Independent RPC library" -DESCRIPTION = "Libtirpc is a port of Suns Transport-Independent RPC library to Linux" -SECTION = "libs/network" -HOMEPAGE = "http://sourceforge.net/projects/libtirpc/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=183075&atid=903784" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ - file://src/netname.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" - -PROVIDES = "virtual/librpc" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ - file://musl.patch \ - " -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" -SRC_URI[md5sum] = "f5d2a623e9dfbd818d2f3f3a4a878e3a" -SRC_URI[sha256sum] = "2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-gssapi" - -CFLAGS += "-fcommon" - -do_install_append() { - chown root:root ${D}${sysconfdir}/netconfig -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb new file mode 100644 index 0000000000..fc66821ecc --- /dev/null +++ b/meta/recipes-extended/libtirpc/libtirpc_1.2.5.bb @@ -0,0 +1,30 @@ +SUMMARY = "Transport-Independent RPC library" +DESCRIPTION = "Libtirpc is a port of Suns Transport-Independent RPC library to Linux" +SECTION = "libs/network" +HOMEPAGE = "http://sourceforge.net/projects/libtirpc/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=183075&atid=903784" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \ + file://src/netname.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" + +PROVIDES = "virtual/librpc" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ + file://0001-xdr_float-do-not-include-bits-endian.h.patch \ + " +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" +SRC_URI[md5sum] = "688787ddff7c6a92ef15ae3f5dc4dfa1" +SRC_URI[sha256sum] = "f3b6350c7e9c3cd9c58fc7a5e5f8e6be469cc571bb5eb31eb9790b3e675186ca" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gssapi" + +CFLAGS += "-fcommon" + +do_install_append() { + chown root:root ${D}${sysconfdir}/netconfig +} + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg