diff options
| author |  foo <foo@bar> | 2013-09-22 05:27:15 +0000 |
|---|---|---|
| committer |  Joey Hess <joey@kitenet.net> | 2013-09-22 01:43:28 -0400 |
| commit | 17617d04cefcce357616144bc7c60d972e5d8ae0 (patch) | |
| tree | 3d2aceecfd5daef3c531131570e0257581287e2b /standalone/android/haskell-patches/zlib_0.5.4.0_0001-hack-to-build-on-Android.patch | |
| parent | f522b2a4e778f07c82d10bf7477e69b35a7191f8 (diff) | |
refresh haskell package patches for new android build
Android build is now almost entirely automated, except for the installation
of cross-built libs needed for XMPP.
Haskell packages updated to current newest versions. Am not currently
pinning the versions, as that didn't work out last time I tried it
(must have missed some pins before).
Diffstat (limited to 'standalone/android/haskell-patches/zlib_0.5.4.0_0001-hack-to-build-on-Android.patch')
| -rw-r--r-- | standalone/android/haskell-patches/zlib_0.5.4.0_0001-hack-to-build-on-Android.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/standalone/android/haskell-patches/zlib_0.5.4.0_0001-hack-to-build-on-Android.patch b/standalone/android/haskell-patches/zlib_0.5.4.0_0001-hack-to-build-on-Android.patch index 3b74bc26d..a899fb892 100644 --- a/standalone/android/haskell-patches/zlib_0.5.4.0_0001-hack-to-build-on-Android.patch +++ b/standalone/android/haskell-patches/zlib_0.5.4.0_0001-hack-to-build-on-Android.patch @@ -30,19 +30,6 @@ index fe851e6..c6168f4 100644 c_deflateInit2_ z a b c d e versionStr (#{const sizeof(z_stream)} :: CInt) foreign import ccall unsafe "zlib.h deflateSetDictionary" -diff --git a/zlib.cabal b/zlib.cabal -index f2d1f5d..751bfab 100644 ---- a/zlib.cabal -+++ b/zlib.cabal -@@ -36,7 +36,7 @@ library - other-modules: Codec.Compression.Zlib.Stream - extensions: CPP, ForeignFunctionInterface - build-depends: base >= 3 && < 5, -- bytestring >= 0.9 && < 0.12 -+ bytestring >= 0.10.3.0 - includes: zlib.h - ghc-options: -Wall - if !os(windows) -- 1.7.10.4 |