mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Build with the git-lfs library when available

Browse source 
Otherwise use the vendored copy as before.

The library is in Debian testing but not stable. Once it reaches
stable, the vendored copy can be removed.

Did not add it to debian/control because IIRC that's used to build
git-annex on stable too, possibly. However, the Debian maintainer will
probably want to make the package depend on libghc-git-lfs-dev.

This commit was sponsored by Ilya Shlyakhter on Patreon.
This commit is contained in:
Joey Hess 2020-06-22 11:21:25 -04:00
parent aa1ad0b7ca
commit 01eb863a14
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
git-annex.cabal
View file

@ -289,6 +289,10 @@ Flag NetworkBSD
Description: Build with network-3.0 which split out network-bsd
Default: True
Flag GitLfs
Description: Build with git-lfs library (rather than vendored copy)
Default: True
source-repository head
type: git
location: git://git-annex.branchable.com/
@ -407,6 +411,12 @@ Executable git-annex
else
Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0)
if flag(GitLfs)
Build-Depends: git-lfs (>= 1.1.0)
CPP-Options: -DWITH_GIT_LFS
else
Other-Modules: Utility.GitLFS
if flag(S3)
Build-Depends: aws (>= 0.20)
CPP-Options: -DWITH_S3
@ -418,6 +428,7 @@ Executable git-annex
Other-Modules:
Remote.WebDAV
Remote.WebDAV.DavLocation
if flag(S3) || flag(WebDAV)
Other-Modules:
Remote.Helper.Http
@ -1059,7 +1070,6 @@ Executable git-annex
Utility.FileSystemEncoding
Utility.Format
Utility.FreeDesktop
Utility.GitLFS
Utility.Glob
Utility.Gpg
Utility.Hash