Commit 7006d535 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Fixed closefrom() glibc 2.35 conflict

parent 5ea60a74
...@@ -23,7 +23,8 @@ all: ...@@ -23,7 +23,8 @@ all:
2: 2:
tar xf fuse-2.9.9.tar.gz tar xf fuse-2.9.9.tar.gz
patch -Np1 -d fuse-2.9.9 < fuse-2.9.9-fix_types.patch patch -Np1 -d fuse-2.9.9 < fuse-2.9.9-fix_types.patch
cd fuse-2.9.9 && ./configure --prefix=/usr --disable-static --exec-prefix=/ CFLAGS="-Dclosefrom=fuse_closefrom" patch -Np1 -d fuse-2.9.9 < fuse-2.9.9-fix_closefrom.patch
cd fuse-2.9.9 && ./configure --prefix=/usr --disable-static --exec-prefix=/
$(MAKE) -C fuse-2.9.9 $(MAKE) -C fuse-2.9.9
$(MAKE) -C fuse-2.9.9 DESTDIR=$(CURDIR)/fuse-2.9.9/Dest install $(MAKE) -C fuse-2.9.9 DESTDIR=$(CURDIR)/fuse-2.9.9/Dest install
install -vm755 fuse-2.9.9/Dest/lib/libfuse.so.2.9.9 /lib install -vm755 fuse-2.9.9/Dest/lib/libfuse.so.2.9.9 /lib
......
diff -uNr fuse-2.9.9/util/ulockmgr_server.c fuse-2.9.9-fix_closefrom/util/ulockmgr_server.c
--- fuse-2.9.9/util/ulockmgr_server.c 2019-01-04 13:33:33.000000000 +0000
+++ fuse-2.9.9-fix_closefrom/util/ulockmgr_server.c 2026-06-09 09:02:55.665184323 +0000
@@ -124,7 +124,7 @@
return res;
}
-static int closefrom(int minfd)
+static int fuse_closefrom(int minfd)
{
DIR *dir = opendir("/proc/self/fd");
if (dir) {
@@ -384,7 +384,7 @@
dup2(nullfd, 1);
}
close(3);
- closefrom(5);
+ fuse_closefrom(5);
while (1) {
char c;
int sock;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment