diff options
| author |  Tomohiro Kusumi <kusumi.tomohiro@gmail.com> | 2018-03-29 04:32:59 +0900 |
|---|---|---|
| committer |  Nikolaus Rath <Nikolaus@rath.org> | 2018-03-28 20:32:59 +0100 |
| commit | 72ab7172b8de822215cea644b148df5eacb8aa0a (patch) | |
| tree | 04051d535d459419e50b6d01959173504c95b4fb | |
| parent | 03515bbb3092da9b3c2c6a267de90f9f0dcbdb29 (diff) | |
Fix build error on DragonFlyBSD (sync with other *BSD) (#240)
DragonFlyBSD has no "bsd" in uname, so add 'dragonfly' to conditionals.
-- e.g. uname(1) in DragonFlyBSD
[root@ ~]# uname
DragonFly
[root@ ~]# python -c "import sys; print(sys.platform)"
dragonfly5
| -rw-r--r-- | doc/meson.build | 2 | ||||
| -rw-r--r-- | example/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | test/util.py | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/doc/meson.build b/doc/meson.build index d95a344..23c8e9a 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -1,4 +1,4 @@ -if not platform.endswith('bsd') +if not platform.endswith('bsd') and platform != 'dragonfly' install_man('fusermount3.1', 'mount.fuse.8') endif diff --git a/example/meson.build b/example/meson.build index 673982c..7349977 100644 --- a/example/meson.build +++ b/example/meson.build @@ -3,7 +3,7 @@ examples = [ 'passthrough', 'passthrough_fh', 'ioctl_client', 'poll_client', 'ioctl', 'cuse', 'cuse_client' ] -if not platform.endswith('bsd') +if not platform.endswith('bsd') and platform != 'dragonfly' examples += 'passthrough_ll' # According to Conrad Meyer <cem@freebsd.org>, FreeBSD doesn't diff --git a/meson.build b/meson.build index 53a3425..b16c51b 100644 --- a/meson.build +++ b/meson.build @@ -93,7 +93,7 @@ thread_dep = dependency('threads') # Read build files from sub-directories # subdirs = [ 'lib', 'include', 'example', 'doc', 'test' ] -if not platform.endswith('bsd') +if not platform.endswith('bsd') and platform != 'dragonfly' subdirs += 'util' endif foreach n : subdirs diff --git a/test/util.py b/test/util.py index c15476b..b9c1b0c 100644 --- a/test/util.py +++ b/test/util.py @@ -46,7 +46,7 @@ def wait_for_mount(mount_process, mnt_dir, def cleanup(mnt_dir): # Don't bother trying Valgrind if things already went wrong - if 'bsd' in sys.platform: + if 'bsd' in sys.platform or 'dragonfly' in sys.platform: cmd = [ 'umount', '-f', mnt_dir ] else: cmd = [pjoin(basename, 'util', 'fusermount3'), @@ -56,7 +56,7 @@ def cleanup(mnt_dir): def umount(mount_process, mnt_dir): - if 'bsd' in sys.platform: + if 'bsd' in sys.platform or 'dragonfly' in sys.platform: cmdline = [ 'umount', mnt_dir ] else: # fusermount3 will be setuid root, so we can only trace it with @@ -109,7 +109,7 @@ def fuse_test_marker(): skip = lambda x: pytest.mark.skip(reason=x) - if 'bsd' in sys.platform: + if 'bsd' in sys.platform or 'dragonfly' in sys.platform: return pytest.mark.uses_fuse() with subprocess.Popen(['which', 'fusermount3'], stdout=subprocess.PIPE, |