1 |
commit: d2a5fee2955b5ea8854c4a27fd3e527e9c2c9129 |
2 |
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Mar 4 10:36:29 2016 +0000 |
4 |
Commit: Amy Winston <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 4 17:43:28 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a5fee2 |
7 |
|
8 |
net-irc/eggdrop: fix compilation with gcc-5 #571004 |
9 |
|
10 |
Backport patch from https://github.com/eggheads/eggdrop/issues/123 |
11 |
|
12 |
Package-Manager: portage-2.2.27 |
13 |
|
14 |
net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild | 3 +- |
15 |
.../eggdrop-1.6.21-fix-gcc5-remove-inline.patch | 52 ++++++++++++++++++++++ |
16 |
2 files changed, 54 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild |
19 |
index 22df039..f761a3b 100644 |
20 |
--- a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild |
21 |
+++ b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2015 Gentoo Foundation |
24 |
+# Copyright 1999-2016 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
# $Id$ |
27 |
|
28 |
@@ -35,6 +35,7 @@ RDEPEND="${DEPEND}" |
29 |
S=${WORKDIR}/${MY_P} |
30 |
|
31 |
src_prepare() { |
32 |
+ epatch "${FILESDIR}/${P}-fix-gcc5-remove-inline.patch" # bug 571004 |
33 |
if use vanilla; then |
34 |
rm -f "${WORKDIR}"/patch/[1-6]*.patch || die |
35 |
fi |
36 |
|
37 |
diff --git a/net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch |
38 |
new file mode 100644 |
39 |
index 0000000..f7bcd8b |
40 |
--- /dev/null |
41 |
+++ b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch |
42 |
@@ -0,0 +1,52 @@ |
43 |
+diff --git a/src/net.c b/src/net.c |
44 |
+index 68c245c..e48fb76 100644 |
45 |
+--- a/src/net.c |
46 |
++++ b/src/net.c |
47 |
+@@ -564,7 +564,7 @@ int open_address_listen(IP addr, int *port) |
48 |
+ /* Returns a socket number for a listening socket that will accept any |
49 |
+ * connection -- port # is returned in port |
50 |
+ */ |
51 |
+-inline int open_listen(int *port) |
52 |
++int open_listen(int *port) |
53 |
+ { |
54 |
+ return open_address_listen(myip[0] ? getmyip() : INADDR_ANY, port); |
55 |
+ } |
56 |
+diff --git a/src/proto.h b/src/proto.h |
57 |
+index 117347e..e80e30b 100644 |
58 |
+--- a/src/proto.h |
59 |
++++ b/src/proto.h |
60 |
+@@ -271,7 +271,7 @@ int getsock(int); |
61 |
+ void killsock(int); |
62 |
+ void killtclsock(int); |
63 |
+ int answer(int, char *, unsigned long *, unsigned short *, int); |
64 |
+-inline int open_listen(int *); |
65 |
++int open_listen(int *); |
66 |
+ int open_address_listen(IP addr, int *); |
67 |
+ int open_telnet(char *, int); |
68 |
+ int open_telnet_dcc(int, char *, char *); |
69 |
+diff --git a/src/tclhash.c b/src/tclhash.c |
70 |
+index 822f920..7281ceb 100644 |
71 |
+--- a/src/tclhash.c |
72 |
++++ b/src/tclhash.c |
73 |
+@@ -109,7 +109,7 @@ static inline void tcl_bind_list_delete(tcl_bind_list_t *tl) |
74 |
+ nfree(tl); |
75 |
+ } |
76 |
+ |
77 |
+-inline void garbage_collect_tclhash(void) |
78 |
++void garbage_collect_tclhash(void) |
79 |
+ { |
80 |
+ tcl_bind_list_t *tl, *tl_next, *tl_prev; |
81 |
+ tcl_bind_mask_t *tm, *tm_next, *tm_prev; |
82 |
+diff --git a/src/tclhash.h b/src/tclhash.h |
83 |
+index 4069014..3bd85a7 100644 |
84 |
+--- a/src/tclhash.h |
85 |
++++ b/src/tclhash.h |
86 |
+@@ -75,7 +75,7 @@ typedef struct tcl_bind_list_b { |
87 |
+ |
88 |
+ #ifndef MAKING_MODS |
89 |
+ |
90 |
+-inline void garbage_collect_tclhash(void); |
91 |
++void garbage_collect_tclhash(void); |
92 |
+ |
93 |
+ void init_bind(void); |
94 |
+ void kill_bind(void); |