summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-09-27 14:22:04 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-09-27 14:22:04 -0400
commit49b3ab607107fe138eba22e408f7ab2801243f7e (patch)
treec0bf5b4882fb528baa018953365e077c8b2eef27
parent097f7ddda269eab7092ddb0caaa57f01b26c8f40 (diff)
Add temporary workaround for bug #763078 which broke building on armel and armhf.
-rwxr-xr-xdebian/cabal-wrapper4
-rw-r--r--debian/changelog2
-rw-r--r--debian/control1
3 files changed, 7 insertions, 0 deletions
diff --git a/debian/cabal-wrapper b/debian/cabal-wrapper
index e0623f79f..1326aead7 100755
--- a/debian/cabal-wrapper
+++ b/debian/cabal-wrapper
@@ -13,4 +13,8 @@ set -e
HOME=$(mktemp -d)
export HOME
+# Temporary workaround for #763078
+PATH=/usr/lib/llvm-3.4/bin:$PATH
+export PATH
+
cabal "$@"
diff --git a/debian/changelog b/debian/changelog
index 46c86790b..3f3cdcef0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ git-annex (5.20140927) UNRELEASED; urgency=medium
* Really depend (not just build-depend) on new enough git for --no-gpg-sign
to work. Closes: #763057
+ * Add temporary workaround for bug #763078 which broke building on armel
+ and armhf.
-- Joey Hess <joeyh@debian.org> Sat, 27 Sep 2014 12:14:15 -0400
diff --git a/debian/control b/debian/control
index ec29aedbf..3b4ee9e84 100644
--- a/debian/control
+++ b/debian/control
@@ -74,6 +74,7 @@ Build-Depends:
curl,
openssh-client,
git-remote-gcrypt (>= 0.20130908-6),
+ llvm-3.4 [armel armhf],
Maintainer: Joey Hess <joeyh@debian.org>
Standards-Version: 3.9.5
Vcs-Git: git://git.kitenet.net/git-annex