summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2018-07-07 09:49:23 +0200
committerJeroen Roovers <jer@gentoo.org>2018-07-07 09:49:39 +0200
commit4a6467112e7e14f9b3ea244a26c6b6fb012312e3 (patch)
tree482db81204ba3ab4d6322f9c0c421d7b51bfd921
parentnet-analyzer/zabbix: Remove old (diff)
downloadgentoo-4a6467112e7e14f9b3ea244a26c6b6fb012312e3.tar.gz
gentoo-4a6467112e7e14f9b3ea244a26c6b6fb012312e3.tar.bz2
gentoo-4a6467112e7e14f9b3ea244a26c6b6fb012312e3.zip
app-text/pinfo: Fix compile failure with GCC 7 / -Os.
Package-Manager: Portage-2.3.41, Repoman-2.3.9
-rw-r--r--app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch42
-rw-r--r--app-text/pinfo/pinfo-0.6.10-r6.ebuild3
2 files changed, 44 insertions, 1 deletions
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
new file mode 100644
index 000000000000..d73ad947c7df
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch
@@ -0,0 +1,42 @@
+--- a/src/initializelinks.c
++++ b/src/initializelinks.c
+@@ -75,7 +75,7 @@
+ * checks if an item belongs to tag table. returns 1 on success and 0 on
+ * failure. It should be optimised...
+ */
+-inline int
++int
+ exists_in_tag_table(char *item)
+ {
+ if (gettagtablepos(item) != -1)
+--- a/src/filehandling_functions.c
++++ b/src/filehandling_functions.c
+@@ -554,7 +554,7 @@
+ return 1;
+ }
+
+-inline void
++void
+ buildcommand(char *dest, char *command, char *filename, const char *tmpfilename)
+ {
+ strcpy(dest, command);
+@@ -564,7 +564,7 @@
+ strcat(dest, tmpfilename);
+ }
+
+-inline void
++void
+ builddircommand(char *dest, char *command, char *filename, const char *tmpfilename)
+ {
+ strcpy(dest, command);
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -193,7 +193,7 @@
+ return value;
+ }
+
+-inline void
++void
+ initlocale()
+ {
+ #ifdef ___DEBUG___
diff --git a/app-text/pinfo/pinfo-0.6.10-r6.ebuild b/app-text/pinfo/pinfo-0.6.10-r6.ebuild
index f18ab4f78a9b..633f0825ca01 100644
--- a/app-text/pinfo/pinfo-0.6.10-r6.ebuild
+++ b/app-text/pinfo/pinfo-0.6.10-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -37,6 +37,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.6.10-ncurses-check.patch
"${FILESDIR}"/${PN}-0.6.10-libc-basename.patch
"${FILESDIR}"/${PN}-0.6.10-clearfilenameprefix.patch
+ "${FILESDIR}"/${PN}-0.6.10-gcc-7-inline.patch
)
src_prepare() {