summaryrefslogtreecommitdiff
path: root/standalone/android
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-23 00:14:48 +0000
committerGravatar Joey Hess <joey@kitenet.net>2013-09-23 00:14:48 +0000
commit5ab2a943cc5006207cb02cbd1b5d77e335eb1267 (patch)
tree72090b7e90629eaee61573212b24292713ae3f71 /standalone/android
parentd50ed3a409609f2e7765a4083289bfe09c122c3f (diff)
fix unix-time
Diffstat (limited to 'standalone/android')
-rw-r--r--standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch25
-rwxr-xr-xstandalone/android/install-haskell-packages1
2 files changed, 26 insertions, 0 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 8bf7981dc..2262d273b 100755
--- a/standalone/android/install-haskell-packages
+++ b/standalone/android/install-haskell-packages
@@ -56,6 +56,7 @@ install_pkgs () {
cd tmp
patched network
+ patched unix-time
patched lifted-base
patched zlib
patched process