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

4 files changed, 28 insertions, 2 deletions

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 3b1b7bf88..69f9b0ea8 100755
--- a/standalone/android/install-haskell-packages
+++ b/standalone/android/install-haskell-packages
@@ -58,6 +58,7 @@ install_pkgs () {
 	cd tmp
 
 	patched network
+	patched unix-time
 	patched lifted-base
 	patched zlib
 	patched process
diff --git a/standalone/linux/runshell b/standalone/linux/runshell
index 6e2e21906..78ba3be15 100755
--- a/standalone/linux/runshell
+++ b/standalone/linux/runshell
@@ -20,7 +20,7 @@ if [ ! -e "$base/bin/git" ]; then
 	exit 1
 fi
 if [ -n "$GIT_ANNEX_STANDLONE_ENV" ]; then
-	echo "** runshell loop detected!"> &2
+	echo "** runshell loop detected!" >&2
 fi
 
 # Get absolute path to base, to avoid breakage when things change directories.
diff --git a/standalone/osx/git-annex.app/Contents/MacOS/runshell b/standalone/osx/git-annex.app/Contents/MacOS/runshell
index 5094ad0b2..01c31de55 100755
--- a/standalone/osx/git-annex.app/Contents/MacOS/runshell
+++ b/standalone/osx/git-annex.app/Contents/MacOS/runshell
@@ -22,7 +22,7 @@ if [ ! -e "$bundle/git" ]; then
 	exit 1
 fi
 if [ -n "$GIT_ANNEX_STANDLONE_ENV" ]; then
-	echo "** runshell loop detected!"> &2
+	echo "** runshell loop detected!" >&2
 fi
 
 # Get absolute path to base, to avoid breakage when things change directories.