summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-06 09:44:55 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-06 09:44:55 -0400
commit07c69b53358df2bce72d3a7aedc9b66a133c5037 (patch)
treeac3ea2babbfb51cbdb530e30af52215afdd8469f /debian
parentc34cc0d4a02b120712b9f92d0d7e7df0b57fc473 (diff)
Avoid depending on regex-tdfa on mips, mipsel, and s390, where it fails to build.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index aee6ca1ab..ae559223b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ git-annex (4.20130502) UNRELEASED; urgency=low
* Disable building with the haskell threaded runtime when the assistant
is not built. This may fix builds on s390x and sparc, which are failing
to link -lHSrts_thr
+ * Avoid depending on regex-tdfa on mips, mipsel, and s390, where it fails
+ to build.
-- Joey Hess <joeyh@debian.org> Thu, 02 May 2013 20:39:19 -0400
diff --git a/debian/control b/debian/control
index fd3121048..a0053d720 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
libghc-hslogger-dev,
libghc-pcre-light-dev,
libghc-sha-dev,
- libghc-regex-tdfa-dev,
+ libghc-regex-tdfa-dev [!mips !mipsel !s390],
libghc-dataenc-dev,
libghc-utf8-string-dev,
libghc-hs3-dev (>= 0.5.6),