From 844566cc9c7de78a93a7ccc8d4491f144b557277 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Oct 2014 14:37:21 -0400 Subject: android rebuild WIP --- .../unix-time_hack-for-Bionic.patch | 44 ++++++++-------------- 1 file changed, 15 insertions(+), 29 deletions(-) (limited to 'standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch') diff --git a/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch b/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch index 276ed9733..16c4f92a2 100644 --- a/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch +++ b/standalone/android/haskell-patches/unix-time_hack-for-Bionic.patch @@ -1,19 +1,18 @@ -From 9569708b67df79185dde603f1305eb84d168eba6 Mon Sep 17 00:00:00 2001 +From db9eb179885874af342bb2c3adef7185496ba1f1 Mon Sep 17 00:00:00 2001 From: dummy -Date: Tue, 14 Oct 2014 01:07:34 +0000 +Date: Wed, 15 Oct 2014 16:37:32 +0000 Subject: [PATCH] hack for bionic --- - Data/UnixTime/Types.hsc | 12 ------------ - cbits/conv.c | 2 +- - unix-time.cabal | 2 -- - 3 files changed, 1 insertion(+), 15 deletions(-) + Data/UnixTime/Types.hsc | 12 ------------ + cbits/conv.c | 2 +- + 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Data/UnixTime/Types.hsc b/Data/UnixTime/Types.hsc -index aa64970..ddca145 100644 +index d30f39b..ec7ca4c 100644 --- a/Data/UnixTime/Types.hsc +++ b/Data/UnixTime/Types.hsc -@@ -12,8 +12,6 @@ import Data.Binary +@@ -9,8 +9,6 @@ import Foreign.Storable #include @@ -21,8 +20,8 @@ index aa64970..ddca145 100644 - -- | -- Data structure for Unix time. - -- -@@ -33,16 +31,6 @@ data UnixTime = UnixTime { + data UnixTime = UnixTime { +@@ -20,16 +18,6 @@ data UnixTime = UnixTime { , utMicroSeconds :: {-# UNPACK #-} !Int32 } deriving (Eq,Ord,Show) @@ -36,14 +35,14 @@ index aa64970..ddca145 100644 - (#poke struct timeval, tv_sec) ptr (utSeconds ut) - (#poke struct timeval, tv_usec) ptr (utMicroSeconds ut) - - #if __GLASGOW_HASKELL__ >= 704 - instance Binary UnixTime where - put (UnixTime (CTime sec) msec) = do + -- | + -- Format of the strptime()/strftime() style. + type Format = ByteString diff --git a/cbits/conv.c b/cbits/conv.c -index 669cfda..8fa5f9a 100644 +index ec31fef..b7bc0f9 100644 --- a/cbits/conv.c +++ b/cbits/conv.c -@@ -98,7 +98,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) { +@@ -96,7 +96,7 @@ time_t c_parse_unix_time_gmt(char *fmt, char *src) { #else strptime(src, fmt, &dst); #endif @@ -52,19 +51,6 @@ index 669cfda..8fa5f9a 100644 } size_t c_format_unix_time(char *fmt, time_t src, char* dst, int siz) { -diff --git a/unix-time.cabal b/unix-time.cabal -index 1061602..588499a 100644 ---- a/unix-time.cabal -+++ b/unix-time.cabal -@@ -15,8 +15,6 @@ Extra-Tmp-Files: config.log config.status autom4te.cache cbits/config.h - Library - Default-Language: Haskell2010 - GHC-Options: -Wall -- if impl(ghc >= 7.8) -- CC-Options: -fPIC - Exposed-Modules: Data.UnixTime - Other-Modules: Data.UnixTime.Conv - Data.UnixTime.Diff -- -1.7.10.4 +2.1.1 -- cgit v1.2.3