summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Waldmann <tw@waldmann-edv.de>2016-05-20 20:00:24 +0200
committerThomas Waldmann <tw@waldmann-edv.de>2016-05-20 21:50:26 +0200
commit21a30269c2c8b967e0a01334f4540b762ce56255 (patch)
tree2f76345b95cbb079896265bcfd26ada795fe870e
parent5be71b506e87533ad122ab3251128b9a1478d6d7 (diff)
freebsd: use a older llfuse release that builds1.0.3
llfuse >0.41.1 <=1.0.0 does not build on freebsd. the issue is already fixed, but no new release yet.
-rw-r--r--Vagrantfile4
-rw-r--r--setup.py6
2 files changed, 8 insertions, 2 deletions
diff --git a/Vagrantfile b/Vagrantfile
index 59ce9f5bb..c9306b54d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -202,8 +202,8 @@ def install_borg(boxname)
rm -f borg/{chunker,crypto,compress,hashindex,platform_linux}.c
rm -rf borg/__pycache__ borg/support/__pycache__ borg/testsuite/__pycache__
pip install -r requirements.d/development.txt
- pip install -r requirements.d/fuse.txt
- pip install -e .
+ # by using [fuse], setup.py can handle different fuse requirements:
+ pip install -e .[fuse]
EOF
end
diff --git a/setup.py b/setup.py
index e7abc79e0..94331086e 100644
--- a/setup.py
+++ b/setup.py
@@ -24,12 +24,18 @@ install_requires = ['msgpack-python>=0.4.6', ]
extras_require = {
# llfuse 0.40 (tested, proven, ok), needs FUSE version >= 2.8.0
# llfuse 0.41 (tested shortly, looks ok), needs FUSE version >= 2.8.0
+ # llfuse 0.41.1 (tested shortly, looks ok), needs FUSE version >= 2.8.0
# llfuse 0.42 (tested shortly, looks ok), needs FUSE version >= 2.8.0
# llfuse 1.0 (tested shortly, looks ok), needs FUSE version >= 2.8.0
# llfuse 2.0 will break API
'fuse': ['llfuse<2.0', ],
}
+if sys.platform.startswith('freebsd'):
+ # while llfuse 1.0 is the latest llfuse release right now,
+ # llfuse 0.41.1 is the latest release that actually builds on freebsd:
+ extras_require['fuse'] = ['llfuse==0.41.1', ]
+
from setuptools import setup, Extension
from setuptools.command.sdist import sdist