Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/pinfo/files/, app-text/pinfo/
Date: Sat, 07 Jul 2018 07:49:47
Message-Id: 1530949779.4a6467112e7e14f9b3ea244a26c6b6fb012312e3.jer@gentoo
1 commit: 4a6467112e7e14f9b3ea244a26c6b6fb012312e3
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 7 07:49:23 2018 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 7 07:49:39 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a646711
7
8 app-text/pinfo: Fix compile failure with GCC 7 / -Os.
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 .../pinfo/files/pinfo-0.6.10-gcc-7-inline.patch | 42 ++++++++++++++++++++++
13 app-text/pinfo/pinfo-0.6.10-r6.ebuild | 3 +-
14 2 files changed, 44 insertions(+), 1 deletion(-)
15
16 diff --git a/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch b/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch
17 new file mode 100644
18 index 00000000000..d73ad947c7d
19 --- /dev/null
20 +++ b/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch
21 @@ -0,0 +1,42 @@
22 +--- a/src/initializelinks.c
23 ++++ b/src/initializelinks.c
24 +@@ -75,7 +75,7 @@
25 + * checks if an item belongs to tag table. returns 1 on success and 0 on
26 + * failure. It should be optimised...
27 + */
28 +-inline int
29 ++int
30 + exists_in_tag_table(char *item)
31 + {
32 + if (gettagtablepos(item) != -1)
33 +--- a/src/filehandling_functions.c
34 ++++ b/src/filehandling_functions.c
35 +@@ -554,7 +554,7 @@
36 + return 1;
37 + }
38 +
39 +-inline void
40 ++void
41 + buildcommand(char *dest, char *command, char *filename, const char *tmpfilename)
42 + {
43 + strcpy(dest, command);
44 +@@ -564,7 +564,7 @@
45 + strcat(dest, tmpfilename);
46 + }
47 +
48 +-inline void
49 ++void
50 + builddircommand(char *dest, char *command, char *filename, const char *tmpfilename)
51 + {
52 + strcpy(dest, command);
53 +--- a/src/utils.c
54 ++++ b/src/utils.c
55 +@@ -193,7 +193,7 @@
56 + return value;
57 + }
58 +
59 +-inline void
60 ++void
61 + initlocale()
62 + {
63 + #ifdef ___DEBUG___
64
65 diff --git a/app-text/pinfo/pinfo-0.6.10-r6.ebuild b/app-text/pinfo/pinfo-0.6.10-r6.ebuild
66 index f18ab4f78a9..633f0825ca0 100644
67 --- a/app-text/pinfo/pinfo-0.6.10-r6.ebuild
68 +++ b/app-text/pinfo/pinfo-0.6.10-r6.ebuild
69 @@ -1,4 +1,4 @@
70 -# Copyright 1999-2017 Gentoo Foundation
71 +# Copyright 1999-2018 Gentoo Foundation
72 # Distributed under the terms of the GNU General Public License v2
73
74 EAPI=6
75 @@ -37,6 +37,7 @@ PATCHES=(
76 "${FILESDIR}"/${PN}-0.6.10-ncurses-check.patch
77 "${FILESDIR}"/${PN}-0.6.10-libc-basename.patch
78 "${FILESDIR}"/${PN}-0.6.10-clearfilenameprefix.patch
79 + "${FILESDIR}"/${PN}-0.6.10-gcc-7-inline.patch
80 )
81
82 src_prepare() {