diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-15 10:58:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-15 10:58:04 -0400 |
| commit | 7a56fe56f9918942aa207039d8e10f5815a7c4ff (patch) | |
| tree | fc487e7eb343aec852dd7db90c52323069159580 /standalone | |
| parent | fb353f52744fac9e2f338f0c2f809dc1075f0a65 (diff) | |
armel autobuilder now working again!
Diffstat (limited to 'standalone')
| -rwxr-xr-x | standalone/android/install-haskell-packages | 2 | ||||
| -rwxr-xr-x | standalone/linux/install-haskell-packages | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index df870b96f..a7ebbc115 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -4,7 +4,7 @@ # # You should install ghc-android first. # -# Note that the newest version of packages is installed. +# Note that the newest version of packages are installed. # It attempts to reuse patches for older versions, but # new versions of packages often break cross-compilation by adding TH, # etc diff --git a/standalone/linux/install-haskell-packages b/standalone/linux/install-haskell-packages index d277dfa5e..f5fd4edfa 100755 --- a/standalone/linux/install-haskell-packages +++ b/standalone/linux/install-haskell-packages @@ -27,7 +27,8 @@ cabalinstall () { patched () { pkg=$1 shift 1 - cabal unpack $pkg + cabal unpack $pkg$1 + shift 1 cd $pkg* git init git config user.name dummy @@ -74,7 +75,11 @@ install_pkgs () { patched yesod-core patched persistent patched persistent-template - patched file-embed + # Newer versions of file-embed cause ghc -ddump-splices + # to output invalid character codes. + # Note that the system generating the splices should also + # use this version of file-embed. + patched file-embed -0.0.6 patched process-conduit patched yesod-static patched yesod-persistent |