android rebuild WIP

This commit is contained in:
Joey Hess 2014-10-15 14:37:21 -04:00
parent 6b08fdc818
commit 4f62c5358c
7 changed files with 199 additions and 214 deletions

View file

@ -1,25 +0,0 @@
From a3cc880bd06a8d7efda79339afa81e02decbd04b Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com>
Date: Mon, 14 Jul 2014 21:01:25 +0000
Subject: [PATCH] fix cross build
---
entropy.cabal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/entropy.cabal b/entropy.cabal
index 914d33a..9ab80f7 100644
--- a/entropy.cabal
+++ b/entropy.cabal
@@ -16,7 +16,7 @@ bug-reports: https://github.com/TomMD/entropy/issues
stability: stable
-- build-type: Simple
-- ^^ Used for HaLVM
-build-type: Custom
+build-type: Simple
-- ^^ Test for RDRAND support using 'ghc'
cabal-version: >=1.10
tested-with: GHC == 7.8.2
--
1.7.10.4

View file

@ -1,26 +1,26 @@
From 63a7a97511266c1a9d2414d3314ee17fc88bb8f2 Mon Sep 17 00:00:00 2001
From 478fc7ae42030c1345e75727e54e1f8f895d3e22 Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com>
Date: Fri, 18 Oct 2013 15:58:35 +0000
Subject: [PATCH] configure misdetects accept4
Date: Wed, 15 Oct 2014 15:16:21 +0000
Subject: [PATCH] avoid accept4
---
Network/Socket.hsc | 4 ++--
Network/Socket.hsc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Network/Socket.hsc b/Network/Socket.hsc
index 9af31f8..6c21209 100644
index 2fe62ee..94db7a4 100644
--- a/Network/Socket.hsc
+++ b/Network/Socket.hsc
@@ -503,7 +503,7 @@ accept sock@(MkSocket s family stype protocol status) = do
return new_sock
@@ -511,7 +511,7 @@ accept sock@(MkSocket s family stype protocol status) = do
#else
with (fromIntegral sz) $ \ ptr_len -> do
new_sock <-
-# ifdef HAVE_ACCEPT4
+#if 0
new_sock <- throwSocketErrorIfMinus1RetryMayBlock "accept"
throwSocketErrorIfMinus1RetryMayBlock "accept"
(threadWaitRead (fromIntegral s))
(c_accept4 s sockaddr ptr_len (#const SOCK_NONBLOCK))
@@ -1615,7 +1615,7 @@ foreign import CALLCONV SAFE_ON_WIN "connect"
@@ -1602,7 +1602,7 @@ foreign import CALLCONV SAFE_ON_WIN "connect"
c_connect :: CInt -> Ptr SockAddr -> CInt{-CSockLen???-} -> IO CInt
foreign import CALLCONV unsafe "accept"
c_accept :: CInt -> Ptr SockAddr -> Ptr CInt{-CSockLen???-} -> IO CInt
@ -30,5 +30,5 @@ index 9af31f8..6c21209 100644
c_accept4 :: CInt -> Ptr SockAddr -> Ptr CInt{-CSockLen???-} -> CInt -> IO CInt
#endif
--
1.7.10.4
2.1.1

View file

@ -1,19 +1,18 @@
From 9569708b67df79185dde603f1305eb84d168eba6 Mon Sep 17 00:00:00 2001
From db9eb179885874af342bb2c3adef7185496ba1f1 Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com>
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 <sys/time.h>
@ -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