Merge pull request #6535 from ipfs/fix/5334

fix {net,open}bsd build by disabling fuse on openbsd
ipfs · Jul 22, 2019 · 876d5ba · 876d5ba
2 parents 30d4e96 + 90c656d
commit 876d5ba
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 10 deletions.
diff --git a/fuse/ipns/ipns_test.go b/fuse/ipns/ipns_test.go
@@ -1,4 +1,4 @@
-// +build !nofuse
+// +build !nofuse,!openbsd,!netbsd
 
 package ipns
 

diff --git a/fuse/ipns/ipns_unix.go b/fuse/ipns/ipns_unix.go
@@ -1,4 +1,4 @@
-// +build !nofuse
+// +build !nofuse,!openbsd,!netbsd
 
 // package fuse/ipns implements a fuse filesystem that interfaces
 // with ipns, the naming system for ipfs.

diff --git a/fuse/ipns/link_unix.go b/fuse/ipns/link_unix.go
@@ -1,4 +1,4 @@
-// +build !nofuse
+// +build !nofuse,!openbsd,!netbsd
 
 package ipns
 

diff --git a/fuse/mount/fuse.go b/fuse/mount/fuse.go
@@ -1,5 +1,4 @@
-// +build !nofuse
-// +build !windows
+// +build !nofuse,!windows,!openbsd,!netbsd
 
 package mount
 

diff --git a/fuse/node/mount_notsupp.go b/fuse/node/mount_notsupp.go
@@ -0,0 +1,13 @@
+// +build !nofuse,openbsd !nofuse,netbsd
+
+package node
+
+import (
+	"errors"
+
+	core "github.com/ipfs/go-ipfs/core"
+)
+
+func Mount(node *core.IpfsNode, fsdir, nsdir string) error {
+	return errors.New("FUSE not supported on OpenBSD or NetBSD. See #5334 (https://git.io/fjMuC).")
+}
diff --git a/fuse/node/mount_test.go b/fuse/node/mount_test.go
@@ -1,4 +1,4 @@
-// +build !nofuse
+// +build !openbsd,!nofuse,!netbsd
 
 package node
 

diff --git a/fuse/node/mount_unix.go b/fuse/node/mount_unix.go
@@ -1,4 +1,4 @@
-// +build !windows,!nofuse
+// +build !windows,!openbsd,!netbsd,!nofuse
 
 package node
 

diff --git a/fuse/readonly/ipfs_test.go b/fuse/readonly/ipfs_test.go
@@ -1,4 +1,4 @@
-// +build !nofuse
+// +build !nofuse,!openbsd,!netbsd
 
 package readonly
 

diff --git a/fuse/readonly/mount_unix.go b/fuse/readonly/mount_unix.go
@@ -1,4 +1,4 @@
-// +build linux darwin freebsd netbsd openbsd
+// +build linux darwin freebsd
 // +build !nofuse
 
 package readonly

diff --git a/fuse/readonly/readonly_unix.go b/fuse/readonly/readonly_unix.go
@@ -1,4 +1,4 @@
-// +build linux darwin freebsd netbsd openbsd
+// +build linux darwin freebsd
 // +build !nofuse
 
 package readonly

diff --git a/mk/util.mk b/mk/util.mk
@@ -20,8 +20,15 @@ SUPPORTED_PLATFORMS += linux-amd64
 SUPPORTED_PLATFORMS += darwin-386
 SUPPORTED_PLATFORMS += darwin-amd64
 
+SUPPORTED_PLATFORMS += freebsd-386
 SUPPORTED_PLATFORMS += freebsd-amd64
 
+SUPPORTED_PLATFORMS += openbsd-386
+SUPPORTED_PLATFORMS += openbsd-amd64
+
+SUPPORTED_PLATFORMS += netbsd-386
+SUPPORTED_PLATFORMS += netbsd-amd64
+
 space:=
 space+=
 comma:=,