android rebuild WIP
This commit is contained in:
parent
6b08fdc818
commit
4f62c5358c
7 changed files with 199 additions and 214 deletions
|
@ -1,14 +1,14 @@
|
|||
constraints: Crypto ==4.2.5.1,
|
||||
DAV ==1.0.1,
|
||||
HTTP ==4000.2.15,
|
||||
DAV ==1.0.3,
|
||||
HTTP ==4000.2.17,
|
||||
HUnit ==1.2.5.2,
|
||||
IfElse ==0.85,
|
||||
IfElse ==0.85.0.0.1,
|
||||
MissingH ==1.2.1.0,
|
||||
MonadRandom ==0.1.13,
|
||||
QuickCheck ==2.7.3,
|
||||
SHA ==1.6.4,
|
||||
QuickCheck ==2.7.6,
|
||||
SHA ==1.6.1,
|
||||
SafeSemaphore ==0.10.1,
|
||||
aeson ==0.7.0.6,
|
||||
aeson ==0.7.0.4,
|
||||
ansi-terminal ==0.6.1.1,
|
||||
ansi-wl-pprint ==0.6.7.1,
|
||||
appar ==0.1.4,
|
||||
|
@ -16,41 +16,36 @@ constraints: Crypto ==4.2.5.1,
|
|||
asn1-parse ==0.8.1,
|
||||
asn1-types ==0.2.3,
|
||||
async ==2.0.1.5,
|
||||
attoparsec ==0.11.3.4,
|
||||
attoparsec ==0.10.4.0,
|
||||
attoparsec-conduit ==1.1.0,
|
||||
authenticate ==1.3.2.8,
|
||||
authenticate ==1.3.2.10,
|
||||
base-unicode-symbols ==0.2.2.4,
|
||||
base16-bytestring ==0.1.1.6,
|
||||
base64-bytestring ==1.0.0.1,
|
||||
bifunctors ==4.1.1.1,
|
||||
binary ==0.7.2.1,
|
||||
blaze-builder ==0.3.3.2,
|
||||
blaze-builder-conduit ==1.1.0,
|
||||
blaze-html ==0.7.0.2,
|
||||
blaze-markup ==0.6.1.0,
|
||||
bloomfilter ==1.2.6.10,
|
||||
byteable ==0.1.1,
|
||||
byteorder ==1.0.4,
|
||||
case-insensitive ==1.2.0.0,
|
||||
case-insensitive ==1.1.0.2,
|
||||
cereal ==0.4.0.1,
|
||||
cipher-aes ==0.2.7,
|
||||
cipher-aes ==0.2.8,
|
||||
cipher-des ==0.0.6,
|
||||
cipher-rc4 ==0.1.4,
|
||||
clientsession ==0.9.0.3,
|
||||
comonad ==4.2,
|
||||
conduit ==1.1.3,
|
||||
conduit-extra ==1.1.0.3,
|
||||
connection ==0.2.1,
|
||||
containers ==0.4.2.1,
|
||||
contravariant ==0.6,
|
||||
cookie ==0.4.1.1,
|
||||
conduit ==1.1.6,
|
||||
conduit-extra ==1.1.3,
|
||||
connection ==0.2.3,
|
||||
contravariant ==0.6.1.1,
|
||||
cookie ==0.4.1.2,
|
||||
cprng-aes ==0.5.2,
|
||||
crypto-api ==0.13,
|
||||
crypto-api ==0.13.2,
|
||||
crypto-cipher-types ==0.0.9,
|
||||
crypto-numbers ==0.2.3,
|
||||
crypto-pubkey ==0.2.4,
|
||||
crypto-pubkey-types ==0.4.2.2,
|
||||
crypto-random ==0.0.7,
|
||||
cryptohash ==0.11.4,
|
||||
cryptohash ==0.11.6,
|
||||
cryptohash-conduit ==0.1.1,
|
||||
css-text ==0.1.2.1,
|
||||
data-default ==0.5.3,
|
||||
|
@ -61,147 +56,153 @@ constraints: Crypto ==4.2.5.1,
|
|||
data-default-instances-old-locale ==0.0.1,
|
||||
dataenc ==0.14.0.7,
|
||||
dbus ==0.10.8,
|
||||
directory ==1.2.1.0,
|
||||
distributive ==0.4.4,
|
||||
dlist ==0.7.0.1,
|
||||
dns ==1.3.0,
|
||||
edit-distance ==0.2.1.2,
|
||||
either ==4.3.1,
|
||||
email-validate ==2.0.1,
|
||||
entropy ==0.2.2.4,
|
||||
either ==4.3,
|
||||
email-validate ==1.0.0,
|
||||
entropy ==0.2.1,
|
||||
errors ==1.4.7,
|
||||
exceptions ==0.6.1,
|
||||
failure ==0.2.0.3,
|
||||
fast-logger ==2.1.5,
|
||||
fdo-notify ==0.3.1,
|
||||
feed ==0.3.9.2,
|
||||
file-embed ==0.0.7,
|
||||
filepath ==1.3.0.0,
|
||||
file-embed ==0.0.6,
|
||||
fingertree ==0.1.0.0,
|
||||
free ==4.9,
|
||||
git-annex ==5.20141013,
|
||||
gnuidn ==0.2.1,
|
||||
gnutls ==0.1.5,
|
||||
gnuidn ==0.2,
|
||||
gnutls ==0.1.4,
|
||||
gsasl ==0.3.5,
|
||||
hS3 ==0.5.8,
|
||||
hamlet ==1.2.0,
|
||||
hashable ==1.2.2.0,
|
||||
hinotify ==0.3.7,
|
||||
hjsmin ==0.1.4.6,
|
||||
hslogger ==1.2.4,
|
||||
http-client ==0.3.3,
|
||||
http-client-tls ==0.2.1.1,
|
||||
http-conduit ==2.1.2,
|
||||
http-date ==0.0.4,
|
||||
hS3 ==0.5.7,
|
||||
hamlet ==1.1.9.2,
|
||||
hashable ==1.2.1.0,
|
||||
hinotify ==0.3.5,
|
||||
hjsmin ==0.1.4.7,
|
||||
hslogger ==1.2.1,
|
||||
http-client ==0.3.8.2,
|
||||
http-client-tls ==0.2.2,
|
||||
http-conduit ==2.1.2.3,
|
||||
http-date ==0.0.2,
|
||||
http-types ==0.8.5,
|
||||
hxt ==9.3.1.4,
|
||||
hxt-charproperties ==9.1.1.1,
|
||||
hxt-regex-xmlschema ==9.1.0,
|
||||
hxt-regex-xmlschema ==9.0.4,
|
||||
hxt-unicode ==9.0.2.2,
|
||||
iproute ==1.2.12,
|
||||
json ==0.7,
|
||||
idna ==0.2,
|
||||
iproute ==1.2.11,
|
||||
json ==0.5,
|
||||
keys ==3.10.1,
|
||||
language-javascript ==0.5.13,
|
||||
lens ==4.4.0.2,
|
||||
libxml-sax ==0.7.5,
|
||||
lifted-base ==0.2.2.2,
|
||||
mime-mail ==0.4.5.2,
|
||||
libxml-sax ==0.7.3,
|
||||
mime-mail ==0.4.1.2,
|
||||
mime-types ==0.1.0.4,
|
||||
mmorph ==1.0.3,
|
||||
monad-control ==0.3.3.0,
|
||||
monad-control ==0.3.2.2,
|
||||
monad-logger ==0.3.6.1,
|
||||
monad-loops ==0.4.2,
|
||||
monad-loops ==0.4.2.1,
|
||||
monads-tf ==0.1.0.2,
|
||||
nats ==0.2,
|
||||
network ==2.5.0.0,
|
||||
mtl ==2.1.2,
|
||||
nats ==0.1.2,
|
||||
network ==2.4.1.2,
|
||||
network-conduit ==1.1.0,
|
||||
network-info ==0.2.0.3,
|
||||
network-multicast ==0.0.11,
|
||||
network-info ==0.2.0.5,
|
||||
network-multicast ==0.0.10,
|
||||
network-protocol-xmpp ==0.4.6,
|
||||
old-locale ==1.0.0.4,
|
||||
old-time ==1.1.0.0,
|
||||
optparse-applicative ==0.8.1,
|
||||
network-uri ==2.6.0.1,
|
||||
optparse-applicative ==0.10.0,
|
||||
parallel ==3.2.0.4,
|
||||
parsec ==3.1.5,
|
||||
path-pieces ==0.1.3.1,
|
||||
path-pieces ==0.1.4,
|
||||
pem ==0.2.2,
|
||||
persistent ==1.3.1.1,
|
||||
persistent-template ==1.3.1.3,
|
||||
persistent ==1.3.3,
|
||||
persistent-template ==1.3.2.2,
|
||||
pointed ==4.0,
|
||||
prelude-extras ==0.4,
|
||||
pretty ==1.1.1.0,
|
||||
primitive ==0.5.3.0,
|
||||
process ==1.2.0.0,
|
||||
profunctors ==4.0.4,
|
||||
publicsuffixlist ==0.1,
|
||||
punycode ==2.0,
|
||||
random ==1.0.1.1,
|
||||
reflection ==1.4,
|
||||
ranges ==0.2.4,
|
||||
reducers ==3.10.2.1,
|
||||
reflection ==1.2.0.1,
|
||||
regex-base ==0.93.2,
|
||||
regex-compat ==0.95.1,
|
||||
regex-posix ==0.95.2,
|
||||
regex-tdfa ==1.2.0,
|
||||
resource-pool ==0.2.2.0,
|
||||
resourcet ==1.1.2.2,
|
||||
rts ==1.0,
|
||||
safe ==0.3.4,
|
||||
scientific ==0.3.2.1,
|
||||
resource-pool ==0.2.1.1,
|
||||
resourcet ==1.1.2.3,
|
||||
safe ==0.3.8,
|
||||
securemem ==0.1.3,
|
||||
semigroupoids ==4.0.2,
|
||||
semigroups ==0.14,
|
||||
shakespeare ==2.0.0.3,
|
||||
shakespeare-css ==1.1.0,
|
||||
shakespeare-i18n ==1.1.0,
|
||||
shakespeare-js ==1.3.0,
|
||||
semigroupoids ==4.2,
|
||||
semigroups ==0.15.3,
|
||||
shakespeare ==1.2.1.1,
|
||||
shakespeare-css ==1.0.7.4,
|
||||
shakespeare-i18n ==1.0.0.5,
|
||||
shakespeare-js ==1.2.0.4,
|
||||
silently ==1.2.4.1,
|
||||
simple-sendfile ==0.2.14,
|
||||
skein ==1.0.9,
|
||||
socks ==0.5.4,
|
||||
split ==0.2.2,
|
||||
stm ==2.4.3,
|
||||
stm ==2.4.2,
|
||||
stm-chans ==3.0.0.2,
|
||||
streaming-commons ==0.1.3,
|
||||
streaming-commons ==0.1.4.1,
|
||||
stringprep ==0.1.5,
|
||||
stringsearch ==0.3.6.5,
|
||||
syb ==0.4.1,
|
||||
system-fileio ==0.3.13,
|
||||
system-filepath ==0.4.11,
|
||||
syb ==0.4.0,
|
||||
system-fileio ==0.3.11,
|
||||
system-filepath ==0.4.12,
|
||||
tagged ==0.7.2,
|
||||
tagsoup ==0.13.1,
|
||||
tagstream-conduit ==0.5.5.1,
|
||||
template-haskell ==2.7.0.0,
|
||||
text ==1.1.1.2,
|
||||
tasty ==0.10,
|
||||
tasty-hunit ==0.9,
|
||||
tasty-quickcheck ==0.8.1,
|
||||
tasty-rerun ==1.1.3,
|
||||
text ==0.11.3.1,
|
||||
text-icu ==0.6.3.7,
|
||||
tf-random ==0.5,
|
||||
tls ==1.2.8,
|
||||
transformers-base ==0.4.2,
|
||||
transformers-compat ==0.3.3,
|
||||
unix ==2.7.0.1,
|
||||
unix-compat ==0.4.1.1,
|
||||
tls ==1.2.9,
|
||||
transformers ==0.3.0.0,
|
||||
transformers-base ==0.4.1,
|
||||
transformers-compat ==0.3.3.3,
|
||||
unbounded-delays ==0.1.0.8,
|
||||
unix-compat ==0.4.0.0,
|
||||
unix-time ==0.2.2,
|
||||
unordered-containers ==0.2.4.0,
|
||||
utf8-string ==0.3.8,
|
||||
unordered-containers ==0.2.5.0,
|
||||
utf8-string ==0.3.7,
|
||||
uuid ==1.3.3,
|
||||
vault ==0.3.0.3,
|
||||
vector ==0.10.9.2,
|
||||
vector ==0.10.0.1,
|
||||
void ==0.6.1,
|
||||
wai ==2.1.0.3,
|
||||
wai-app-static ==2.0.1,
|
||||
wai-extra ==2.1.1.2,
|
||||
wai ==3.0.1.1,
|
||||
wai-app-static ==3.0.0.1,
|
||||
wai-extra ==3.0.1.2,
|
||||
wai-logger ==2.1.1,
|
||||
warp ==2.1.5.2,
|
||||
warp-tls ==2.0.5,
|
||||
word8 ==0.0.4,
|
||||
warp ==3.0.0.5,
|
||||
warp-tls ==3.0.0,
|
||||
word8 ==0.1.1,
|
||||
x509 ==1.4.11,
|
||||
x509-store ==1.4.4,
|
||||
x509-system ==1.4.5,
|
||||
x509-validation ==1.5.0,
|
||||
xml ==1.3.13,
|
||||
xml-conduit ==1.2.0.2,
|
||||
xml-hamlet ==0.4.0.8,
|
||||
xml-conduit ==1.2.1,
|
||||
xml-hamlet ==0.4.0.9,
|
||||
xml-types ==0.3.4,
|
||||
xss-sanitize ==0.3.5.2,
|
||||
yaml ==0.8.8.3,
|
||||
yesod ==1.2.5.2,
|
||||
yesod-auth ==1.3.0.5,
|
||||
yesod-core ==1.2.15.1,
|
||||
yaml ==0.8.9.3,
|
||||
yesod ==1.2.6.1,
|
||||
yesod-auth ==1.3.4.6,
|
||||
yesod-core ==1.2.20.1,
|
||||
yesod-default ==1.2.0,
|
||||
yesod-form ==1.3.9,
|
||||
yesod-persistent ==1.2.2.3,
|
||||
yesod-routes ==1.2.0.6,
|
||||
yesod-static ==1.2.3,
|
||||
yesod-form ==1.3.16,
|
||||
yesod-persistent ==1.2.3.1,
|
||||
yesod-routes ==1.2.0.7,
|
||||
yesod-static ==1.2.4,
|
||||
zlib ==0.5.4.1,
|
||||
zlib-conduit ==1.1.0
|
||||
bytestring ==0.10.4.0,
|
||||
scientific ==0.2.0.2
|
||||
|
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -50,9 +50,15 @@ patched () {
|
|||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
set -x
|
||||
ln -sf ../../cabal.config
|
||||
cabal install "$@"
|
||||
if [ -e config.sub ]; then
|
||||
cp /usr/share/misc/config.sub .
|
||||
fi
|
||||
if [ -e config.guess ]; then
|
||||
cp /usr/share/misc/config.guess .
|
||||
fi
|
||||
cabal install # --reinstall --force-reinstalls
|
||||
rm -f cabal.config
|
||||
|
||||
rm -rf $pkg*
|
||||
|
@ -72,6 +78,8 @@ install_pkgs () {
|
|||
rm -rf tmp
|
||||
mkdir tmp
|
||||
cd tmp
|
||||
cat <<EOF
|
||||
EOF
|
||||
patched network
|
||||
patched unix-time
|
||||
patched lifted-base
|
||||
|
@ -82,7 +90,7 @@ install_pkgs () {
|
|||
patched iproute
|
||||
patched primitive
|
||||
patched socks
|
||||
patched entropy
|
||||
# patched entropy # needed for newer version, not current pinned version
|
||||
patched vector
|
||||
patched stm-chans
|
||||
patched persistent
|
||||
|
@ -119,17 +127,9 @@ install_pkgs () {
|
|||
installgitannexdeps -fAndroid -f-Pairing
|
||||
}
|
||||
|
||||
echo
|
||||
echo
|
||||
echo native build
|
||||
echo
|
||||
setupcabal
|
||||
installgitannexdeps
|
||||
# native cabal needs its own update
|
||||
cabal update
|
||||
|
||||
echo
|
||||
echo
|
||||
echo cross build
|
||||
echo
|
||||
PATH=$HOME/.ghc/$(cat abiversion)/bin:$HOME/.ghc/$(cat abiversion)/arm-linux-androideabi/bin:$PATH
|
||||
setupcabal
|
||||
install_pkgs
|
||||
|
|
|
@ -1,43 +1,41 @@
|
|||
From ec2543b2156dc968530ad98e33d26f741a479e31 Mon Sep 17 00:00:00 2001
|
||||
From aae3ace106cf26c931cc94c96fb6fbfe83f950f2 Mon Sep 17 00:00:00 2001
|
||||
From: dummy <dummy@example.com>
|
||||
Date: Tue, 14 Oct 2014 01:23:56 +0000
|
||||
Subject: [PATCH] hack to build
|
||||
Date: Wed, 15 Oct 2014 17:05:37 +0000
|
||||
Subject: [PATCH] avoid TH
|
||||
|
||||
---
|
||||
Database/Persist/Sql/Raw.hs | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
Database/Persist/Sql/Raw.hs | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Database/Persist/Sql/Raw.hs b/Database/Persist/Sql/Raw.hs
|
||||
index 319d75f..db3ee43 100644
|
||||
index 3ac2ca9..bcc2011 100644
|
||||
--- a/Database/Persist/Sql/Raw.hs
|
||||
+++ b/Database/Persist/Sql/Raw.hs
|
||||
@@ -15,7 +15,7 @@ import Data.IORef (writeIORef, readIORef, newIORef)
|
||||
@@ -11,7 +11,7 @@ import Data.IORef (writeIORef, readIORef, newIORef)
|
||||
import Control.Exception (throwIO)
|
||||
import Control.Monad (when, liftM)
|
||||
import Data.Text (Text, pack)
|
||||
-import Control.Monad.Logger (logDebugS, runLoggingT)
|
||||
+-- import Control.Monad.Logger (logDebugS, runLoggingT)
|
||||
-import Control.Monad.Logger (logDebugS)
|
||||
+--import Control.Monad.Logger (logDebugS)
|
||||
import Data.Int (Int64)
|
||||
import Control.Monad.Trans.Class (lift)
|
||||
import qualified Data.Text as T
|
||||
import Data.Conduit
|
||||
@@ -39,8 +39,6 @@ rawQueryRes
|
||||
rawQueryRes sql vals = do
|
||||
conn <- ask
|
||||
let make = do
|
||||
- runLoggingT ($logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals)
|
||||
- (connLogFunc conn)
|
||||
getStmtConn conn sql
|
||||
return $ do
|
||||
stmt <- mkAcquire make stmtReset
|
||||
@@ -52,8 +50,6 @@ rawExecute x y = liftM (const ()) $ rawExecuteCount x y
|
||||
rawExecuteCount :: MonadIO m => Text -> [PersistValue] -> ReaderT Connection m Int64
|
||||
@@ -23,7 +23,6 @@ rawQuery :: (MonadSqlPersist m, MonadResource m)
|
||||
-> [PersistValue]
|
||||
-> Source m [PersistValue]
|
||||
rawQuery sql vals = do
|
||||
- lift $ $logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals
|
||||
conn <- lift askSqlConn
|
||||
bracketP
|
||||
(getStmtConn conn sql)
|
||||
@@ -35,7 +34,6 @@ rawExecute x y = liftM (const ()) $ rawExecuteCount x y
|
||||
|
||||
rawExecuteCount :: MonadSqlPersist m => Text -> [PersistValue] -> m Int64
|
||||
rawExecuteCount sql vals = do
|
||||
conn <- ask
|
||||
- runLoggingT ($logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals)
|
||||
- (connLogFunc conn)
|
||||
- $logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals
|
||||
stmt <- getStmt sql
|
||||
res <- liftIO $ stmtExecute stmt vals
|
||||
liftIO $ stmtReset stmt
|
||||
--
|
||||
1.7.10.4
|
||||
2.1.1
|
||||
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
From b0a79f4f98188ba5d43b7e3912b36d34d099ab65 Mon Sep 17 00:00:00 2001
|
||||
From 6ffd4fcb7d27ec6df709d80a40a262406446a259 Mon Sep 17 00:00:00 2001
|
||||
From: dummy <dummy@example.com>
|
||||
Date: Fri, 18 Oct 2013 23:20:35 +0000
|
||||
Date: Wed, 15 Oct 2014 17:00:56 +0000
|
||||
Subject: [PATCH] cross build
|
||||
|
||||
---
|
||||
Data/Vector/Fusion/Stream/Monadic.hs | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
Data/Vector/Fusion/Stream/Monadic.hs | 1 -
|
||||
Data/Vector/Unboxed/Base.hs | 13 -------------
|
||||
2 files changed, 14 deletions(-)
|
||||
|
||||
diff --git a/Data/Vector/Fusion/Stream/Monadic.hs b/Data/Vector/Fusion/Stream/Monadic.hs
|
||||
index 51fec75..b089b3d 100644
|
||||
|
@ -19,6 +20,30 @@ index 51fec75..b089b3d 100644
|
|||
#endif
|
||||
|
||||
emptyStream :: String
|
||||
diff --git a/Data/Vector/Unboxed/Base.hs b/Data/Vector/Unboxed/Base.hs
|
||||
index 00350cb..34bfc4a 100644
|
||||
--- a/Data/Vector/Unboxed/Base.hs
|
||||
+++ b/Data/Vector/Unboxed/Base.hs
|
||||
@@ -65,19 +65,6 @@ vectorTyCon = mkTyCon3 "vector"
|
||||
vectorTyCon m s = mkTyCon $ m ++ "." ++ s
|
||||
#endif
|
||||
|
||||
-instance Typeable1 Vector where
|
||||
- typeOf1 _ = mkTyConApp (vectorTyCon "Data.Vector.Unboxed" "Vector") []
|
||||
-
|
||||
-instance Typeable2 MVector where
|
||||
- typeOf2 _ = mkTyConApp (vectorTyCon "Data.Vector.Unboxed.Mutable" "MVector") []
|
||||
-
|
||||
-instance (Data a, Unbox a) => Data (Vector a) where
|
||||
- gfoldl = G.gfoldl
|
||||
- toConstr _ = error "toConstr"
|
||||
- gunfold _ _ = error "gunfold"
|
||||
- dataTypeOf _ = G.mkType "Data.Vector.Unboxed.Vector"
|
||||
- dataCast1 = G.dataCast
|
||||
-
|
||||
-- ----
|
||||
-- Unit
|
||||
-- ----
|
||||
--
|
||||
1.7.10.4
|
||||
2.1.1
|
||||
|
||||
|
|
Loading…
Reference in a new issue