Merge pull request #789 from trapexit/freebsd

freebsd: misc cleanups to get freebsd compiling

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)
 OPT_FLAGS := -O0 -g
@@ -56,7 +65,7 @@ LDFLAGS = \
 	-lrt \
 	-pthread
 
-all: build/libfuse.a mount.mergerfs mergerfs-fusermount
+all: build/libfuse.a $(UTILS)
 
 build/config.h: build/stamp
 	ecfd/build | tee build/config.h
@@ -71,6 +80,8 @@ objects: build/config.h
 build/libfuse.a: objects
 	ar rcs build/libfuse.a $(OBJS)
 
+utils: mergerfs-fusermount mount.mergerfs
+
 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
 
@@ -93,12 +104,14 @@ strip:
 	strip --strip-all build/mount.mergerfs
 	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/mount.mergerfs "$(INSTALLSBINDIR)/mount.mergerfs"
-	chown root:root "$(INSTALLBINDIR)/mergerfs-fusermount"
+	chown root "$(INSTALLBINDIR)/mergerfs-fusermount"
 	chmod u+s "$(INSTALLBINDIR)/mergerfs-fusermount"
 
-.PHONY: objects strip
+install: $(INSTALLUTILS)
+
+.PHONY: objects strip utils install install-utils
 
 -include $(DEPS)

src/config_moveonenospc.cpp

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

src/config_nfsopenhack.cpp

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

src/config_readdir.cpp

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

src/fs_base_getdents.cpp

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

src/fs_findonfs.cpp

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

src/fs_inode.cpp

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