Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: net-libs/libtirpc/files/
Date: Wed, 26 Feb 2020 12:06:22
Message-Id: 1582718768.2d6097b9d063af8225463181162e01ad6e853e05.blueness@gentoo
1 commit: 2d6097b9d063af8225463181162e01ad6e853e05
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 26 12:06:08 2020 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 26 12:06:08 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2d6097b9
7
8 net-libs/libtirpc: add missing patch
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
12
13 .../libtirpc-1.2.5-avoid-multiple-definition.patch | 44 ++++++++++++++++++++++
14 1 file changed, 44 insertions(+)
15
16 diff --git a/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch b/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch
17 new file mode 100644
18 index 0000000..a5fecc5
19 --- /dev/null
20 +++ b/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch
21 @@ -0,0 +1,44 @@
22 +From 69682de06816de9b9014441d23bda1918ee2e2fb Mon Sep 17 00:00:00 2001
23 +From: Mike Gilbert <floppym@g.o>
24 +Date: Sun, 19 Jan 2020 16:57:45 -0500
25 +Subject: [PATCH] Avoid multiple-definiton with gcc -fno-common
26 +
27 +GCC 10 enables -fno-common by default.
28 +
29 +Bug: https://bugs.gentoo.org/705896
30 +---
31 + src/rpc_com.h | 3 +--
32 + src/svc.c | 3 +++
33 + 2 files changed, 4 insertions(+), 2 deletions(-)
34 +
35 +diff --git a/src/rpc_com.h b/src/rpc_com.h
36 +index 10bec79..76badef 100644
37 +--- a/src/rpc_com.h
38 ++++ b/src/rpc_com.h
39 +@@ -61,8 +61,7 @@ void __xprt_unregister_unlocked(SVCXPRT *);
40 + void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *);
41 +
42 +
43 +-SVCXPRT **__svc_xports;
44 +-int __svc_maxrec;
45 ++extern int __svc_maxrec;
46 +
47 + #ifdef __cplusplus
48 + }
49 +diff --git a/src/svc.c b/src/svc.c
50 +index b59467b..6db164b 100644
51 +--- a/src/svc.c
52 ++++ b/src/svc.c
53 +@@ -57,6 +57,9 @@
54 +
55 + #define max(a, b) (a > b ? a : b)
56 +
57 ++static SVCXPRT **__svc_xports;
58 ++int __svc_maxrec;
59 ++
60 + /*
61 + * The services list
62 + * Each entry represents a set of procedures (an rpc program).
63 +--
64 +2.25.0
65 +