diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-26 13:40:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-26 13:41:33 -0400 |
| commit | 1119cc2f38e032a4ebb786f023c281ee40fe2d0f (patch) | |
| tree | 58ae20311671821f0e4a91f0389e1e9645cfd3c9 | |
| parent | 425b6fca0046d6fb8ddd8a8a4f2bd77fef52c25d (diff) | |
Add build dep on regex-compat to fix build on mipsel, which lacks regex-tdfa.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 6b9c0d3a9..af91b51f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ git-annex (5.20140222) UNRELEASED; urgency=medium * webdav: Fix path separator bug when used on Windows. * repair: Optimise unpacking of pack files, and avoid repeated error messages about corrupt pack files. + * Add build dep on regex-compat to fix build on mipsel, which lacks + regex-tdfa. -- Joey Hess <joeyh@debian.org> Fri, 21 Feb 2014 13:03:04 -0400 diff --git a/debian/control b/debian/control index 067c2ab67..bcb51d935 100644 --- a/debian/control +++ b/debian/control @@ -52,6 +52,7 @@ Build-Depends: libghc-http-dev, libghc-feed-dev, libghc-regex-tdfa-dev [!mipsel !s390], + libghc-regex-compat-dev [mipsel s390], libghc-tasty-dev (>= 0.7) [!mipsel !sparc], libghc-tasty-hunit-dev [!mipsel !sparc], libghc-tasty-quickcheck-dev [!mipsel !sparc], diff --git a/git-annex.cabal b/git-annex.cabal index 3189a8ab4..8228cdc66 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -123,6 +123,8 @@ Executable git-annex if flag(TDFA) Build-Depends: regex-tdfa CPP-Options: -DWITH_TDFA + else + Build-Depends: regex-compat if flag(CryptoHash) Build-Depends: cryptohash (>= 0.10.0) |