From 17b4058ee944ab660b30593a858ff9d591b62a3b Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Wed, 26 Feb 2020 16:28:55 +0000 Subject: [PATCH] mount: constrain to go1.13 or above otherwise bazil.org/fuse fails to compile --- backend/cache/cache_mount_other_test.go | 6 +++--- backend/cache/cache_mount_unix_test.go | 2 +- cmd/mount/dir.go | 2 +- cmd/mount/file.go | 2 +- cmd/mount/fs.go | 2 +- cmd/mount/handle.go | 2 +- cmd/mount/mount.go | 2 +- cmd/mount/mount_test.go | 2 +- cmd/mount/mount_unsupported.go | 14 +++++++------- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/backend/cache/cache_mount_other_test.go b/backend/cache/cache_mount_other_test.go index 268be43bd..086428569 100644 --- a/backend/cache/cache_mount_other_test.go +++ b/backend/cache/cache_mount_other_test.go @@ -1,6 +1,6 @@ -// +build !linux !go1.11 -// +build !darwin !go1.11 -// +build !freebsd !go1.11 +// +build !linux !go1.13 +// +build !darwin !go1.13 +// +build !freebsd !go1.13 // +build !windows package cache_test diff --git a/backend/cache/cache_mount_unix_test.go b/backend/cache/cache_mount_unix_test.go index 6a3d8a334..47927bd5f 100644 --- a/backend/cache/cache_mount_unix_test.go +++ b/backend/cache/cache_mount_unix_test.go @@ -1,4 +1,4 @@ -// +build linux,go1.11 darwin,go1.11 freebsd,go1.11 +// +build linux,go1.13 darwin,go1.13 freebsd,go1.13 package cache_test diff --git a/cmd/mount/dir.go b/cmd/mount/dir.go index bbc304ffb..0841cd937 100644 --- a/cmd/mount/dir.go +++ b/cmd/mount/dir.go @@ -1,4 +1,4 @@ -// +build linux,go1.11 darwin,go1.11 freebsd,go1.11 +// +build linux,go1.13 darwin,go1.13 freebsd,go1.13 package mount diff --git a/cmd/mount/file.go b/cmd/mount/file.go index f43de8a20..077d1a7ad 100644 --- a/cmd/mount/file.go +++ b/cmd/mount/file.go @@ -1,4 +1,4 @@ -// +build linux,go1.11 darwin,go1.11 freebsd,go1.11 +// +build linux,go1.13 darwin,go1.13 freebsd,go1.13 package mount diff --git a/cmd/mount/fs.go b/cmd/mount/fs.go index 5769b44b0..baa285fb6 100644 --- a/cmd/mount/fs.go +++ b/cmd/mount/fs.go @@ -1,6 +1,6 @@ // FUSE main Fs -// +build linux,go1.11 darwin,go1.11 freebsd,go1.11 +// +build linux,go1.13 darwin,go1.13 freebsd,go1.13 package mount diff --git a/cmd/mount/handle.go b/cmd/mount/handle.go index bc5bea08f..a69784fea 100644 --- a/cmd/mount/handle.go +++ b/cmd/mount/handle.go @@ -1,4 +1,4 @@ -// +build linux,go1.11 darwin,go1.11 freebsd,go1.11 +// +build linux,go1.13 darwin,go1.13 freebsd,go1.13 package mount diff --git a/cmd/mount/mount.go b/cmd/mount/mount.go index 2d5e2d4f2..8a496aefc 100644 --- a/cmd/mount/mount.go +++ b/cmd/mount/mount.go @@ -1,6 +1,6 @@ // Package mount implents a FUSE mounting system for rclone remotes. -// +build linux,go1.11 darwin,go1.11 freebsd,go1.11 +// +build linux,go1.13 darwin,go1.13 freebsd,go1.13 package mount diff --git a/cmd/mount/mount_test.go b/cmd/mount/mount_test.go index 839f26503..da9827c7d 100644 --- a/cmd/mount/mount_test.go +++ b/cmd/mount/mount_test.go @@ -1,4 +1,4 @@ -// +build linux,go1.11 darwin,go1.11 freebsd,go1.11 +// +build linux,go1.13 darwin,go1.13 freebsd,go1.13 package mount diff --git a/cmd/mount/mount_unsupported.go b/cmd/mount/mount_unsupported.go index 7d6f12c1f..7b40e0f2c 100644 --- a/cmd/mount/mount_unsupported.go +++ b/cmd/mount/mount_unsupported.go @@ -1,14 +1,14 @@ // Build for mount for unsupported platforms to stop go complaining // about "no buildable Go source files " -// Invert the build constraint: linux,go1.11 darwin,go1.11 freebsd,go1.11 +// Invert the build constraint: linux,go1.13 darwin,go1.13 freebsd,go1.13 // -// !((linux&&go1.11) || (darwin&&go1.11) || (freebsd&&go1.11)) -// == !(linux&&go1.11) && !(darwin&&go1.11) && !(freebsd&&go1.11)) -// == (!linux || !go1.11) && (!darwin || go1.11) && (!freebsd || !go1.11)) +// !((linux&&go1.13) || (darwin&&go1.13) || (freebsd&&go1.13)) +// == !(linux&&go1.13) && !(darwin&&go1.13) && !(freebsd&&go1.13)) +// == (!linux || !go1.13) && (!darwin || go1.13) && (!freebsd || !go1.13)) -// +build !linux !go1.11 -// +build !darwin !go1.11 -// +build !freebsd !go1.11 +// +build !linux !go1.13 +// +build !darwin !go1.13 +// +build !freebsd !go1.13 package mount