mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-02 08:23:58 +00:00
fuse: Define closefrom if not available
Fixes build with glibc 2.34+ Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
96e37f4a59
commit
37afc556c2
@ -0,0 +1,51 @@
|
|||||||
|
From: Sam James <sam@gentoo.org>
|
||||||
|
Date: Sat, 24 Jul 2021 22:02:45 +0100
|
||||||
|
Subject: [PATCH] util/ulockmgr_server.c: conditionally define closefrom (fix
|
||||||
|
glibc-2.34+)
|
||||||
|
|
||||||
|
closefrom(3) has joined us in glibc-land from *BSD and Solaris. Since
|
||||||
|
it's available in glibc 2.34+, we want to detect it and only define our
|
||||||
|
fallback if the libc doesn't provide it.
|
||||||
|
|
||||||
|
Bug: https://bugs.gentoo.org/803923
|
||||||
|
Signed-off-by: Sam James <sam@gentoo.org>
|
||||||
|
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -55,6 +55,7 @@ fi
|
||||||
|
|
||||||
|
AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat])
|
||||||
|
AC_CHECK_FUNCS([posix_fallocate])
|
||||||
|
+AC_CHECK_FUNCS([closefrom])
|
||||||
|
AC_CHECK_MEMBERS([struct stat.st_atim])
|
||||||
|
AC_CHECK_MEMBERS([struct stat.st_atimespec])
|
||||||
|
|
||||||
|
--- a/util/ulockmgr_server.c
|
||||||
|
+++ b/util/ulockmgr_server.c
|
||||||
|
@@ -22,6 +22,10 @@
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
|
||||||
|
+#ifdef HAVE_CONFIG_H
|
||||||
|
+ #include "config.h"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
struct message {
|
||||||
|
unsigned intr : 1;
|
||||||
|
unsigned nofd : 1;
|
||||||
|
@@ -124,6 +128,7 @@ static int receive_message(int sock, voi
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if !defined(HAVE_CLOSEFROM)
|
||||||
|
static int closefrom(int minfd)
|
||||||
|
{
|
||||||
|
DIR *dir = opendir("/proc/self/fd");
|
||||||
|
@@ -141,6 +146,7 @@ static int closefrom(int minfd)
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
static void send_reply(int cfd, struct message *msg)
|
||||||
|
{
|
||||||
@ -14,6 +14,7 @@ SRC_URI = "https://github.com/libfuse/libfuse/releases/download/${BP}/${BP}.tar.
|
|||||||
file://gold-unversioned-symbol.patch \
|
file://gold-unversioned-symbol.patch \
|
||||||
file://aarch64.patch \
|
file://aarch64.patch \
|
||||||
file://0001-fuse-fix-the-return-value-of-help-option.patch \
|
file://0001-fuse-fix-the-return-value-of-help-option.patch \
|
||||||
|
file://fuse2-0007-util-ulockmgr_server.c-conditionally-define-closefro.patch \
|
||||||
file://fuse.conf \
|
file://fuse.conf \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "8000410aadc9231fd48495f7642f3312"
|
SRC_URI[md5sum] = "8000410aadc9231fd48495f7642f3312"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user