summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2015-12-19 13:25:18 +0100
committerChristoph Mende <angelos@gentoo.org>2015-12-19 13:25:18 +0100
commit55108e5462e1acf9adf6c67531b901e37648a2fa (patch)
tree287e4d8d6591b9caa45d19b31c60d510db62d2be /net-misc/oidentd
parentelisp.eclass: Delete superfluous quotes in case statements. (diff)
downloadgentoo-55108e5462e1acf9adf6c67531b901e37648a2fa.tar.gz
gentoo-55108e5462e1acf9adf6c67531b901e37648a2fa.tar.bz2
gentoo-55108e5462e1acf9adf6c67531b901e37648a2fa.zip
net-misc/oidentd: fix compilation with gcc5 (bug #568586)
Package-Manager: portage-2.2.26
Diffstat (limited to 'net-misc/oidentd')
-rw-r--r--net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch25
-rw-r--r--net-misc/oidentd/oidentd-2.0.8-r5.ebuild5
2 files changed, 28 insertions, 2 deletions
diff --git a/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch b/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch
new file mode 100644
index 000000000000..a401a65d9bc6
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.0.8-gcc5.patch
@@ -0,0 +1,25 @@
+Description: Fix a failure to build with gcc5.
+Bug: http://bugs.debian.org/778035
+
+--- a/src/oidentd_util.c 2015-07-03 05:56:24.000000000 -0400
++++ b/src/oidentd_util.c 2015-07-03 05:56:47.671378000 -0400
+@@ -75,7 +75,7 @@
+ ** PRNG functions on systems whose libraries provide them.)
+ */
+
+-inline int randval(int i) {
++extern __attribute__ ((gnu_inline)) int randval(int i) {
+ /* Per _Numerical Recipes in C_: */
+ return ((double) i * rand() / (RAND_MAX+1.0));
+ }
+--- a/src/oidentd_util.h 2015-07-03 05:56:32.000000000 -0400
++++ b/src/oidentd_util.h 2015-07-03 05:56:53.835378000 -0400
+@@ -58,7 +58,7 @@
+ int find_group(const char *temp_group, gid_t *gid);
+
+ int random_seed(void);
+-inline int randval(int i);
++extern __attribute__ ((gnu_inline)) int randval(int i);
+
+ #ifndef HAVE_SNPRINTF
+ int snprintf(char *str, size_t n, char const *fmt, ...);
diff --git a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
index 0193766f640e..b93ad92aef12 100644
--- a/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,8 @@ IUSE="debug ipv6 masquerade"
src_prepare() {
epatch "${FILESDIR}/${P}-masquerading.patch" \
- "${FILESDIR}/${P}-bind-to-ipv6-too.patch"
+ "${FILESDIR}/${P}-bind-to-ipv6-too.patch" \
+ "${FILESDIR}/${P}-gcc5.patch"
}
src_configure() {