summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdebian/cabal-wrapper16
-rw-r--r--debian/changelog6
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules3
-rw-r--r--doc/bugs/cabal_install_fails:_Could_not_find_module___8216__Network.URI__8217__.mdwn4
-rw-r--r--git-annex.cabal2
6 files changed, 27 insertions, 5 deletions
diff --git a/debian/cabal-wrapper b/debian/cabal-wrapper
new file mode 100755
index 000000000..e0623f79f
--- /dev/null
+++ b/debian/cabal-wrapper
@@ -0,0 +1,16 @@
+#!/bin/sh
+# It would be more usual to use:
+# export CABAL=./Setup
+# But Setup currently has a very bad dependency resolver, and very bad
+# debugging output, and tends to eat all memory and die on small buildds.
+#
+# This should be revisited once Debian has a newer ghc than 7.6.3,
+# and hopefully gets the improved dependency resolver from cabal.
+set -e
+
+# Avoid cabal writing to HOME, and avoid local cabal settings
+# influencing the build.
+HOME=$(mktemp -d)
+export HOME
+
+cabal "$@"
diff --git a/debian/changelog b/debian/changelog
index 41228c5b7..3ee0374e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-git-annex (5.20140920) UNRELEASED; urgency=medium
+git-annex (5.20140926) unstable; urgency=high
* Depend on new enough git for --no-gpg-sign to work. Closes: #762446
+ * Work around failure to build on mips by using cabal, not Setup,
+ to build in debian/rules.
- -- Joey Hess <joeyh@debian.org> Mon, 22 Sep 2014 13:50:00 -0400
+ -- Joey Hess <joeyh@debian.org> Fri, 26 Sep 2014 15:09:02 -0400
git-annex (5.20140919) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 91747c417..b2f7d8cca 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
Build-Depends:
debhelper (>= 9),
ghc (>= 7.4),
+ cabal-install,
libghc-mtl-dev (>= 2.1.1),
libghc-missingh-dev,
libghc-data-default-dev,
diff --git a/debian/rules b/debian/rules
index 3a0511fa6..7c8f8a560 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
-# Avoid using cabal, as it writes to $HOME
-export CABAL=./Setup
+export CABAL=debian/cabal-wrapper
# Do use the changelog's version number, rather than making one up.
export RELEASE_BUILD=1
diff --git a/doc/bugs/cabal_install_fails:_Could_not_find_module___8216__Network.URI__8217__.mdwn b/doc/bugs/cabal_install_fails:_Could_not_find_module___8216__Network.URI__8217__.mdwn
index b175ec5a4..2f9b5de3e 100644
--- a/doc/bugs/cabal_install_fails:_Could_not_find_module___8216__Network.URI__8217__.mdwn
+++ b/doc/bugs/cabal_install_fails:_Could_not_find_module___8216__Network.URI__8217__.mdwn
@@ -210,3 +210,7 @@ network-protocol-xmpp-0.4.6 depends on gnuidn-0.2.1 which failed to install.
# End of transcript or log.
"""]]
+
+> This is a bug in hS3, not in git-annex. hS3 needs to be updated
+> per the example at <http://hackage.haskell.org/package/network>.
+> Email sent to hS3 author; [[done]]. --[[Joey]]
diff --git a/git-annex.cabal b/git-annex.cabal
index 5b2b2daca..9dd815732 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 5.20140919
+Version: 5.20140926
Cabal-Version: >= 1.8
License: GPL-3
Maintainer: Joey Hess <joey@kitenet.net>