diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-06-16 01:31:11 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-19 13:18:56 +0100 |
commit | f1bae584ffb56e8268a448bef96716f5089afbcf (patch) | |
tree | 796c76080e1896535cc007b285b237454a97514c /meta | |
parent | 38af5819e1b4035383142338ebea64d9a3ef2d52 (diff) | |
download | poky-f1bae584ffb56e8268a448bef96716f5089afbcf.tar.gz |
rpcsvc-proto: Upgrade to 1.4.4
Drop already upstreamed patch in 1.4.4
(From OE-Core rev: 1dddd4bf9bdb26069a1a0d4fcb8aeefd5761c620)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
3 files changed, 6 insertions, 90 deletions
diff --git a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb index 00919a3d70..20933153a3 100644 --- a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb +++ b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb | |||
@@ -15,13 +15,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0daaf958d5531ab86169ec6e275e1517" | |||
15 | SECTION = "libs" | 15 | SECTION = "libs" |
16 | DEPENDS += "rpcsvc-proto-native" | 16 | DEPENDS += "rpcsvc-proto-native" |
17 | 17 | ||
18 | PV = "1.4.3" | 18 | PV = "1.4.4" |
19 | 19 | ||
20 | SRCREV = "71e0a12c04d130a78674ac6309eefffa6ecee612" | 20 | SRCREV = "c65926005e50da02a4da3e26abc42eded36cd19d" |
21 | 21 | ||
22 | SRC_URI = "git://github.com/thkukuk/${BPN};branch=master;protocol=https \ | 22 | SRC_URI = "git://github.com/thkukuk/${BPN};branch=master;protocol=https \ |
23 | file://0001-Use-cross-compiled-rpcgen.patch \ | 23 | file://0001-Use-cross-compiled-rpcgen.patch \ |
24 | file://0001-Use-AC_SYS_LARGEFILE-macro-to-control-largefile-supp.patch \ | ||
25 | " | 24 | " |
26 | 25 | ||
27 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-AC_SYS_LARGEFILE-macro-to-control-largefile-supp.patch b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-AC_SYS_LARGEFILE-macro-to-control-largefile-supp.patch deleted file mode 100644 index f07866d55a..0000000000 --- a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-AC_SYS_LARGEFILE-macro-to-control-largefile-supp.patch +++ /dev/null | |||
@@ -1,80 +0,0 @@ | |||
1 | From 6820c53c3952f78185beb59f767c372fc745dcf3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 11 Dec 2022 21:42:59 -0800 | ||
4 | Subject: [PATCH] Use AC_SYS_LARGEFILE macro to control largefile support | ||
5 | |||
6 | The autoconf macro AC_SYS_LARGEFILE defines _FILE_OFFSET_BITS=64 | ||
7 | where necessary to ensure that off_t and all interfaces using off_t | ||
8 | are 64bit, even on 32bit systems. | ||
9 | |||
10 | replace stat64 by equivalent stat struct/func | ||
11 | |||
12 | Upstream-Status: Accepted [https://github.com/thkukuk/rpcsvc-proto/pull/15] | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | configure.ac | 1 + | ||
16 | rpcgen/rpc_main.c | 16 +++++----------- | ||
17 | 2 files changed, 6 insertions(+), 11 deletions(-) | ||
18 | |||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index bacc2fb..a9fc730 100644 | ||
21 | --- a/configure.ac | ||
22 | +++ b/configure.ac | ||
23 | @@ -8,6 +8,7 @@ AC_PREFIX_DEFAULT(/usr) | ||
24 | AC_SUBST(PACKAGE) | ||
25 | AC_SUBST(VERSION) | ||
26 | |||
27 | +AC_SYS_LARGEFILE | ||
28 | AC_PROG_CC | ||
29 | AC_GNU_SOURCE | ||
30 | AM_PROG_CC_C_O | ||
31 | diff --git a/rpcgen/rpc_main.c b/rpcgen/rpc_main.c | ||
32 | index 277adc6..fd7dea9 100644 | ||
33 | --- a/rpcgen/rpc_main.c | ||
34 | +++ b/rpcgen/rpc_main.c | ||
35 | @@ -62,12 +62,6 @@ | ||
36 | #define EXTEND 1 /* alias for TRUE */ | ||
37 | #define DONT_EXTEND 0 /* alias for FALSE */ | ||
38 | |||
39 | -#ifdef __APPLE__ | ||
40 | -# if __DARWIN_ONLY_64_BIT_INO_T | ||
41 | -# define stat64 stat | ||
42 | -# endif | ||
43 | -#endif | ||
44 | - | ||
45 | struct commandline | ||
46 | { | ||
47 | int cflag; /* xdr C routines */ | ||
48 | @@ -337,9 +331,9 @@ clear_args (void) | ||
49 | static void | ||
50 | find_cpp (void) | ||
51 | { | ||
52 | - struct stat64 buf; | ||
53 | + struct stat buf; | ||
54 | |||
55 | - if (stat64 (CPP, &buf) == 0) | ||
56 | + if (stat (CPP, &buf) == 0) | ||
57 | return; | ||
58 | |||
59 | if (cppDefined) /* user specified cpp but it does not exist */ | ||
60 | @@ -1125,17 +1119,17 @@ putarg (int whereto, const char *cp) | ||
61 | static void | ||
62 | checkfiles (const char *infile, const char *outfile) | ||
63 | { | ||
64 | - struct stat64 buf; | ||
65 | + struct stat buf; | ||
66 | |||
67 | if (infile) /* infile ! = NULL */ | ||
68 | - if (stat64 (infile, &buf) < 0) | ||
69 | + if (stat (infile, &buf) < 0) | ||
70 | { | ||
71 | perror (infile); | ||
72 | crash (); | ||
73 | } | ||
74 | if (outfile) | ||
75 | { | ||
76 | - if (stat64 (outfile, &buf) < 0) | ||
77 | + if (stat (outfile, &buf) < 0) | ||
78 | return; /* file does not exist */ | ||
79 | else | ||
80 | { | ||
diff --git a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch index 208974004b..8e459b5634 100644 --- a/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch +++ b/meta/recipes-extended/rpcsvc-proto/rpcsvc-proto/0001-Use-cross-compiled-rpcgen.patch | |||
@@ -10,14 +10,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | rpcsvc/Makefile.am | 2 +- | 10 | rpcsvc/Makefile.am | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | Index: git/rpcsvc/Makefile.am | 13 | --- a/rpcsvc/Makefile.am |
14 | =================================================================== | 14 | +++ b/rpcsvc/Makefile.am |
15 | --- git.orig/rpcsvc/Makefile.am | 15 | @@ -12,4 +12,4 @@ nodist_rpcsvc_HEADERS = klm_prot.h nlm_p |
16 | +++ git/rpcsvc/Makefile.am | ||
17 | @@ -12,5 +12,5 @@ nodist_rpcsvc_HEADERS = klm_prot.h nlm_p | ||
18 | nfs_prot.h rquota.h sm_inter.h | 16 | nfs_prot.h rquota.h sm_inter.h |
19 | 17 | ||
20 | %.h: %.x | 18 | .x.h: |
21 | - $(top_builddir)/rpcgen/rpcgen -h -o $@ $< | 19 | - $(top_builddir)/rpcgen/rpcgen -h -o $@ $< |
22 | + rpcgen -h -o $@ $< | 20 | + rpcgen -h -o $@ $< |
23 | |||