summaryrefslogtreecommitdiff
path: root/standalone
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-08 16:48:29 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-08 16:48:29 -0400
commit1f4765571cf8130a9836326f2afc0ecfe354fb5f (patch)
tree37cb600e68e07af2c5c716c555671928d0c1a1d0 /standalone
parent5f8500e4f1d9f55e328fadba5610084bd3cf6570 (diff)
more fixes
Diffstat (limited to 'standalone')
-rwxr-xr-xstandalone/android/install-haskell-packages6
1 files changed, 3 insertions, 3 deletions
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages
index 370cb0c32..63f7dd368 100755
--- a/standalone/android/install-haskell-packages
+++ b/standalone/android/install-haskell-packages
@@ -63,7 +63,7 @@ install_pkgs () {
mkdir tmp
cd tmp
- onlycross unpatched bytestring-0.10.3.0 text-0.11.2.3 parsec-3.1.3
+ onlycross unpatched bytestring-0.10.3.0 text-0.11.3.1 parsec-3.1.3
patched network 2.4.1.0
unpatched cereal-0.3.5.2
patched socks 0.4.2
@@ -121,7 +121,7 @@ install_pkgs () {
patched file-embed 0.0.4.7
patched gsasl 0.3.5 \
--ghc-options=-I$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/sysroot/usr/include/ \
- --ld-options="-L $HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/sysroot/usr/lib/"
+ --ld-options="-L$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/sysroot/usr/lib/"
onlycross patched network-protocol-xmpp 0.4.4
onlynative network-protocol-xmpp
patched shakespeare-css 1.0.2
@@ -164,7 +164,7 @@ if [ "$1" = native ]; then
fi
install_pkgs
else
- native=0
+ native=
PATH=$HOME/.ghc/android-14/arm-linux-androideabi-4.7/bin:$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin:$PATH
if [ ! -e $HOME/.ghc/android-14/arm-linux-androideabi-4.7/cabal/packages/hackage.haskell.org ]; then
cabal update