git-annex/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch

70 lines
2.2 KiB
Diff
Raw Normal View History

2014-07-14 21:58:13 +00:00
From add5feeb9ee9b4ffa1b43e4ba04b63e5ac2bfaf7 Mon Sep 17 00:00:00 2001
2013-10-18 20:19:22 +00:00
From: dummy <dummy@example.com>
2014-07-14 21:58:13 +00:00
Date: Mon, 14 Jul 2014 20:45:24 +0000
Subject: [PATCH] hack for bionic
2013-09-23 00:14:48 +00:00
---
2013-10-18 20:19:22 +00:00
Data/UnixTime/Types.hsc | 12 ------------
cbits/conv.c | 2 +-
2014-07-14 21:58:13 +00:00
unix-time.cabal | 1 -
3 files changed, 1 insertion(+), 14 deletions(-)
2013-09-23 00:14:48 +00:00
2013-10-18 20:19:22 +00:00
diff --git a/Data/UnixTime/Types.hsc b/Data/UnixTime/Types.hsc
2014-07-14 21:58:13 +00:00
index 2ad0623..04fd766 100644
2013-10-18 20:19:22 +00:00
--- a/Data/UnixTime/Types.hsc
+++ b/Data/UnixTime/Types.hsc
2014-07-14 21:58:13 +00:00
@@ -12,8 +12,6 @@ import Data.Binary
2013-10-18 20:19:22 +00:00
#include <sys/time.h>
-#let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
-
-- |
-- Data structure for Unix time.
data UnixTime = UnixTime {
2014-07-14 21:58:13 +00:00
@@ -23,16 +21,6 @@ data UnixTime = UnixTime {
2013-10-18 20:19:22 +00:00
, utMicroSeconds :: {-# UNPACK #-} !Int32
} deriving (Eq,Ord,Show)
-instance Storable UnixTime where
- sizeOf _ = (#size struct timeval)
- alignment _ = (#alignment struct timeval)
- peek ptr = UnixTime
- <$> (#peek struct timeval, tv_sec) ptr
- <*> (#peek struct timeval, tv_usec) ptr
- poke ptr ut = do
- (#poke struct timeval, tv_sec) ptr (utSeconds ut)
- (#poke struct timeval, tv_usec) ptr (utMicroSeconds ut)
-
2014-07-14 21:58:13 +00:00
#if __GLASGOW_HASKELL__ >= 704
2014-07-03 23:47:49 +00:00
instance Binary UnixTime where
put (UnixTime (CTime sec) msec) = do
2013-09-23 00:14:48 +00:00
diff --git a/cbits/conv.c b/cbits/conv.c
2014-07-03 23:47:49 +00:00
index ec31fef..b7bc0f9 100644
2013-09-23 00:14:48 +00:00
--- a/cbits/conv.c
+++ b/cbits/conv.c
2014-07-03 23:47:49 +00:00
@@ -96,7 +96,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) {
2013-09-23 00:14:48 +00:00
#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) {
2014-07-14 21:58:13 +00:00
diff --git a/unix-time.cabal b/unix-time.cabal
index 5de3f7c..7a0c244 100644
--- a/unix-time.cabal
+++ b/unix-time.cabal
@@ -15,7 +15,6 @@ Extra-Tmp-Files: config.log config.status autom4te.cache cbits/config.h
Library
Default-Language: Haskell2010
GHC-Options: -Wall
- CC-Options: -fPIC
Exposed-Modules: Data.UnixTime
Other-Modules: Data.UnixTime.Conv
Data.UnixTime.Diff
2013-09-23 00:14:48 +00:00
--
1.7.10.4