Merge remote-tracking branch 'in/android-rebuild' into android-rebuild

4 files changed, 45 insertions, 6 deletions

diff --git a/Build/EvilSplicer.hs b/Build/EvilSplicer.hs
index 7476e1a0a..11ab7612b 100644
--- a/Build/EvilSplicer.hs
+++ b/Build/EvilSplicer.hs
@@ -332,12 +332,12 @@ mangleCode = flip_colon
 		preindent <- many1 $ oneOf " \n"
 		string "\\ "
 		lambdaparams <- restofline
-		continuedlambdaparams <- many $ do
+		continuedlambdaparams <- many $ try $ do
 			indent <- many1 $ char ' '
 			p <- satisfy isLetter
 			aram <- many $ satisfy isAlphaNum <|> oneOf "_"
 			newline
-			return $ indent ++ p:aram
+			return $ indent ++ p:aram ++ "\n"
 		indent <- many1 $ char ' '
 		string "-> "
 		firstline <- restofline
@@ -348,7 +348,8 @@ mangleCode = flip_colon
 			return $ indent ++ " " ++ l
 		return $ concat 
 			[ prefix:preindent
-			, "(\\ " ++ lambdaparams ++ "\n" ++ intercalate "\n" continuedlambdaparams
+			, "(\\ " ++ lambdaparams ++ "\n"
+			, concat continuedlambdaparams
 			, indent ++ "-> "
 			, lambdaparens $ intercalate "\n" (firstline:lambdalines)
 			, ")\n"
diff --git a/standalone/android/clean-haskell-packages b/standalone/android/clean-haskell-packages
new file mode 100755
index 000000000..bffdf00bb
--- /dev/null
+++ b/standalone/android/clean-haskell-packages
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Removes all currently installed cross-compiled haskell packages
+# except those part of ghc.
+# Useful if the build failed.
+rm -f $(grep -l $HOME/.ghc/android-14/arm-linux-androideabi-4.7/.cabal/lib/ $HOME/.ghc/android-14/arm-linux-androideabi-4.7/lib/*-ghc-*/package.conf.d/*.conf)
+$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin/ghc-pkg recache
diff --git a/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch b/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch
new file mode 100644
index 000000000..80b509f5f
--- /dev/null
+++ b/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch
@@ -0,0 +1,25 @@
+From eff7034f0c9f80fd30c9d8952b3fd0a343adccc8 Mon Sep 17 00:00:00 2001
+From: foo <bar>
+Date: Mon, 23 Sep 2013 00:12:35 +0000
+Subject: [PATCH] hack for Bionic
+
+---
+ cbits/conv.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cbits/conv.c b/cbits/conv.c
+index 7ff7b87..2e4c870 100644
+--- a/cbits/conv.c
++++ b/cbits/conv.c
+@@ -55,7 +55,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) {
+ #else
+     strptime(src, fmt, &dst);
+ #endif
+-    return timegm(&dst);
++    return NULL; /* timegm(&dst); (not in Bionic) */
+ }
+ 
+ size_t c_format_unix_time(char *fmt, time_t src, char* dst, int siz) {
+-- 
+1.7.10.4
+
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages
index bd56120a6..2262d273b 100755
--- a/standalone/android/install-haskell-packages
+++ b/standalone/android/install-haskell-packages
@@ -11,6 +11,10 @@
 
 set -e
 
+if [ ! -d haskell-patches ]; then
+	cd standalone/android
+fi
+
 cabalopts="$@"
 
 cabalinstall () {
@@ -24,6 +28,8 @@ patched () {
 	cabal unpack $pkg
 	cd $pkg*
 	git init
+	git config user.name dummy
+	git config user.email dummy@example.com
 	git add .
 	git commit -m "pre-patched state of $pkg"
 	for patch in ../../haskell-patches/${pkg}_*; do
@@ -34,7 +40,7 @@ patched () {
 			$SHELL
 		fi
 	done
-	cabalinstall --force-reinstalls "$@"
+	cabalinstall "$@"
 	rm -rf $pkg*
 	cd ..
 }
@@ -50,6 +56,7 @@ install_pkgs () {
 	cd tmp
 
 	patched network
+	patched unix-time
 	patched lifted-base
 	patched zlib
 	patched process
@@ -70,12 +77,11 @@ install_pkgs () {
 	patched profunctors
 	patched skein
 	patched lens
-	patched DAV
 	patched persistent-template
 	patched file-embed
 	patched wai-app-static
-	patched hamlet
 	patched shakespeare
+	patched hamlet
 	patched shakespeare-css
         patched shakespeare-js
 	patched yesod-routes
@@ -86,6 +92,7 @@ install_pkgs () {
 	patched yesod
 	patched async
 	patched gnuidn
+	patched DAV
 
 	installgitannexdeps -fAndroid -f-Pairing