remove PatchedAWS flag
Now that deps are sorted out in hackage, cabal is unlikely to try to install a too old AWS, so I don't think this flag is worth the bother of being completely correct with the dependency versioning. This avoids me needing to enable to flag on the autobuilders..
This commit is contained in:
parent
caf72b1b8c
commit
41f0f3daa2
2 changed files with 1 additions and 13 deletions
4
debian/rules
vendored
4
debian/rules
vendored
|
@ -8,10 +8,6 @@ export RELEASE_BUILD=1
|
|||
%:
|
||||
dh $@
|
||||
|
||||
# Debian currently has a patched aws 0.9.2, rather than the newer 0.10.2.
|
||||
override_dh_auto_configure:
|
||||
debian/cabal-wrapper configure -fPatchedAWS
|
||||
|
||||
# Not intended for use by anyone except the author.
|
||||
announcedir:
|
||||
@echo ${HOME}/src/git-annex/doc/news
|
||||
|
|
|
@ -34,10 +34,6 @@ Description:
|
|||
Flag S3
|
||||
Description: Enable S3 support
|
||||
|
||||
Flag PatchedAWS
|
||||
Description: Building on system, like Debian, with old AWS patched to support git-annex
|
||||
Default: False
|
||||
|
||||
Flag WebDAV
|
||||
Description: Enable WebDAV support
|
||||
|
||||
|
@ -155,11 +151,7 @@ Executable git-annex
|
|||
CPP-Options: -DWITH_CRYPTOHASH
|
||||
|
||||
if flag(S3)
|
||||
Build-Depends: conduit, resourcet, conduit-extra
|
||||
if flag(PatchedAWS)
|
||||
Build-Depends: aws (>= 0.9.2)
|
||||
else
|
||||
Build-Depends: aws (>= 0.10.4)
|
||||
Build-Depends: conduit, resourcet, conduit-extra, aws (>= 0.9.2)
|
||||
CPP-Options: -DWITH_S3
|
||||
|
||||
if flag(WebDAV)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue