summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-fs/nfs-utils/files/nfs-utils-2.6.4-C99-inline.patch26
-rw-r--r--net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild1
2 files changed, 27 insertions, 0 deletions
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.6.4-C99-inline.patch b/net-fs/nfs-utils/files/nfs-utils-2.6.4-C99-inline.patch
new file mode 100644
index 000000000000..2797249523f6
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.6.4-C99-inline.patch
@@ -0,0 +1,26 @@
+C99 `inline` is not guaranteed to emit an external definition
+https://www.greenend.org.uk/rjk/tech/inline.html
+Bug: https://bugs.gentoo.org/922958
+
+--- a/utils/exportd/exportd.c
++++ b/utils/exportd/exportd.c
+@@ -53,7 +53,7 @@
+ */
+ inline static void set_signals(void);
+
+-inline void
++inline static void
+ cleanup_lockfiles (void)
+ {
+ unlink(etab.lockfn);
+--- a/utils/mountd/mountd.c
++++ b/utils/mountd/mountd.c
+@@ -111,7 +111,7 @@
+ nfs_svc_unregister(MOUNTPROG, MOUNTVERS_NFSV3);
+ }
+
+-static void
++inline static void
+ cleanup_lockfiles (void)
+ {
+ unlink(etab.lockfn);
diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
index 993fead7ae7c..1a00c46a24df 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.5.2-no-werror.patch
"${FILESDIR}"/${PN}-udev-sysctl.patch
"${FILESDIR}"/${P}-includes.patch
+ "${FILESDIR}"/${P}-C99-inline.patch
)
pkg_setup() {