commit: d2a5fee2955b5ea8854c4a27fd3e527e9c2c9129 Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com> AuthorDate: Fri Mar 4 10:36:29 2016 +0000 Commit: Amy Winston <amynka <AT> gentoo <DOT> org> CommitDate: Fri Mar 4 17:43:28 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a5fee2
net-irc/eggdrop: fix compilation with gcc-5 #571004 Backport patch from https://github.com/eggheads/eggdrop/issues/123 Package-Manager: portage-2.2.27 net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild | 3 +- .../eggdrop-1.6.21-fix-gcc5-remove-inline.patch | 52 ++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild index 22df039..f761a3b 100644 --- a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild +++ b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -35,6 +35,7 @@ RDEPEND="${DEPEND}" S=${WORKDIR}/${MY_P} src_prepare() { + epatch "${FILESDIR}/${P}-fix-gcc5-remove-inline.patch" # bug 571004 if use vanilla; then rm -f "${WORKDIR}"/patch/[1-6]*.patch || die fi 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 new file mode 100644 index 0000000..f7bcd8b --- /dev/null +++ b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch @@ -0,0 +1,52 @@ +diff --git a/src/net.c b/src/net.c +index 68c245c..e48fb76 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -564,7 +564,7 @@ int open_address_listen(IP addr, int *port) + /* Returns a socket number for a listening socket that will accept any + * connection -- port # is returned in port + */ +-inline int open_listen(int *port) ++int open_listen(int *port) + { + return open_address_listen(myip[0] ? getmyip() : INADDR_ANY, port); + } +diff --git a/src/proto.h b/src/proto.h +index 117347e..e80e30b 100644 +--- a/src/proto.h ++++ b/src/proto.h +@@ -271,7 +271,7 @@ int getsock(int); + void killsock(int); + void killtclsock(int); + int answer(int, char *, unsigned long *, unsigned short *, int); +-inline int open_listen(int *); ++int open_listen(int *); + int open_address_listen(IP addr, int *); + int open_telnet(char *, int); + int open_telnet_dcc(int, char *, char *); +diff --git a/src/tclhash.c b/src/tclhash.c +index 822f920..7281ceb 100644 +--- a/src/tclhash.c ++++ b/src/tclhash.c +@@ -109,7 +109,7 @@ static inline void tcl_bind_list_delete(tcl_bind_list_t *tl) + nfree(tl); + } + +-inline void garbage_collect_tclhash(void) ++void garbage_collect_tclhash(void) + { + tcl_bind_list_t *tl, *tl_next, *tl_prev; + tcl_bind_mask_t *tm, *tm_next, *tm_prev; +diff --git a/src/tclhash.h b/src/tclhash.h +index 4069014..3bd85a7 100644 +--- a/src/tclhash.h ++++ b/src/tclhash.h +@@ -75,7 +75,7 @@ typedef struct tcl_bind_list_b { + + #ifndef MAKING_MODS + +-inline void garbage_collect_tclhash(void); ++void garbage_collect_tclhash(void); + + void init_bind(void); + void kill_bind(void);
