Browse Source

Merge pull request #789 from trapexit/freebsd

freebsd: misc cleanups to get freebsd compiling
pull/790/head
trapexit 4 years ago
committed by GitHub
parent
commit
0682ebf103
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 23
      libfuse/Makefile
  2. 3
      src/config_moveonenospc.cpp
  3. 1
      src/config_nfsopenhack.cpp
  4. 1
      src/config_readdir.cpp
  5. 2
      src/fs_base_getdents.cpp
  6. 1
      src/fs_findonfs.cpp
  7. 1
      src/fs_inode.cpp

23
libfuse/Makefile

@ -1,4 +1,13 @@
VERSION = 2.9.7-mergerfs_2.29.0
VERSION = 2.9.7-mergerfs_2.30.0
OS := $(shell uname -s)
ifeq ($(OS),Linux)
UTILS := utils
INSTALLUTILS := install-utils
else
UTILS :=
INSTALLUTILS :=
endif
ifeq ($(DEBUG),1) ifeq ($(DEBUG),1)
OPT_FLAGS := -O0 -g OPT_FLAGS := -O0 -g
@ -56,7 +65,7 @@ LDFLAGS = \
-lrt \ -lrt \
-pthread -pthread
all: build/libfuse.a mount.mergerfs mergerfs-fusermount
all: build/libfuse.a $(UTILS)
build/config.h: build/stamp build/config.h: build/stamp
ecfd/build | tee build/config.h ecfd/build | tee build/config.h
@ -71,6 +80,8 @@ objects: build/config.h
build/libfuse.a: objects build/libfuse.a: objects
ar rcs build/libfuse.a $(OBJS) ar rcs build/libfuse.a $(OBJS)
utils: mergerfs-fusermount mount.mergerfs
build/mergerfs-fusermount: build/config.h util/fusermount.c lib/mount_util.c build/mergerfs-fusermount: build/config.h util/fusermount.c lib/mount_util.c
$(CC) $(CFLAGS) $(FUSE_FLAGS) -Ilib -o build/mergerfs-fusermount util/fusermount.c lib/mount_util.c $(CC) $(CFLAGS) $(FUSE_FLAGS) -Ilib -o build/mergerfs-fusermount util/fusermount.c lib/mount_util.c
@ -93,12 +104,14 @@ strip:
strip --strip-all build/mount.mergerfs strip --strip-all build/mount.mergerfs
strip --strip-all build/mergerfs-fusermount strip --strip-all build/mergerfs-fusermount
install: mergerfs-fusermount mount.mergerfs strip
install-utils: mergerfs-fusermount mount.mergerfs strip
install -D build/mergerfs-fusermount "$(INSTALLBINDIR)/mergerfs-fusermount" install -D build/mergerfs-fusermount "$(INSTALLBINDIR)/mergerfs-fusermount"
install -D build/mount.mergerfs "$(INSTALLSBINDIR)/mount.mergerfs" install -D build/mount.mergerfs "$(INSTALLSBINDIR)/mount.mergerfs"
chown root:root "$(INSTALLBINDIR)/mergerfs-fusermount"
chown root "$(INSTALLBINDIR)/mergerfs-fusermount"
chmod u+s "$(INSTALLBINDIR)/mergerfs-fusermount" chmod u+s "$(INSTALLBINDIR)/mergerfs-fusermount"
.PHONY: objects strip
install: $(INSTALLUTILS)
.PHONY: objects strip utils install install-utils
-include $(DEPS) -include $(DEPS)

3
src/config_moveonenospc.cpp

@ -16,9 +16,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#include "config_moveonenospc.hpp"
#include "ef.hpp" #include "ef.hpp"
#include "errno.hpp"
#include "from_string.hpp" #include "from_string.hpp"
#include "config_moveonenospc.hpp"
int int
MoveOnENOSPC::from_string(const std::string &s_) MoveOnENOSPC::from_string(const std::string &s_)

1
src/config_nfsopenhack.cpp

@ -18,6 +18,7 @@
#include "config_nfsopenhack.hpp" #include "config_nfsopenhack.hpp"
#include "ef.hpp" #include "ef.hpp"
#include "errno.hpp"
template<> template<>
int int

1
src/config_readdir.cpp

@ -18,6 +18,7 @@
#include "config_readdir.hpp" #include "config_readdir.hpp"
#include "ef.hpp" #include "ef.hpp"
#include "errno.hpp"
template<> template<>
int int

2
src/fs_base_getdents.cpp

@ -16,6 +16,8 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#include "errno.hpp"
#if defined __linux__ #if defined __linux__
#include <unistd.h> #include <unistd.h>
#include <sys/syscall.h> #include <sys/syscall.h>

1
src/fs_findonfs.cpp

@ -17,6 +17,7 @@
*/ */
#include "branch.hpp" #include "branch.hpp"
#include "errno.hpp"
#include "fs_base_stat.hpp" #include "fs_base_stat.hpp"
#include "fs_path.hpp" #include "fs_path.hpp"

1
src/fs_inode.cpp

@ -17,6 +17,7 @@
*/ */
#include "ef.hpp" #include "ef.hpp"
#include "errno.hpp"
#include "fasthash.h" #include "fasthash.h"
#include "fs_inode.hpp" #include "fs_inode.hpp"

Loading…
Cancel
Save