diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-18 19:05:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-18 19:05:33 -0400 |
| commit | ba597e8bd3a5bc0648f407da1df0cdb28adc01e5 (patch) | |
| tree | 32605666bff19ebfa10f27cdc2ec4a941ecaeffd /standalone/android | |
| parent | a2188fcadeca170db6847b2485f1c36d8af5f6d6 (diff) | |
remove patch that is no longer needed
Diffstat (limited to 'standalone/android')
| -rw-r--r-- | standalone/android/haskell-patches/unordered-containers_fix-build-with-new-ghc.patch | 32 | ||||
| -rwxr-xr-x | standalone/android/install-haskell-packages | 1 |
2 files changed, 0 insertions, 33 deletions
diff --git a/standalone/android/haskell-patches/unordered-containers_fix-build-with-new-ghc.patch b/standalone/android/haskell-patches/unordered-containers_fix-build-with-new-ghc.patch deleted file mode 100644 index 7c0774e67..000000000 --- a/standalone/android/haskell-patches/unordered-containers_fix-build-with-new-ghc.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2d1f0027ae1ca56bbf4449887cf3bc61dc1c8e84 Mon Sep 17 00:00:00 2001 -From: foo <foo@bar> -Date: Sat, 21 Sep 2013 22:32:01 +0000 -Subject: [PATCH] fix build with new ghc - ---- - Data/HashMap/Base.hs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Data/HashMap/Base.hs b/Data/HashMap/Base.hs -index 6a77df4..93a384d 100644 ---- a/Data/HashMap/Base.hs -+++ b/Data/HashMap/Base.hs -@@ -86,7 +86,7 @@ import qualified Data.List as L - import Data.Monoid (Monoid(mempty, mappend)) - import Data.Traversable (Traversable(..)) - import Data.Word (Word) --import GHC.Exts ((==#), build, reallyUnsafePtrEquality#) -+import GHC.Exts ((==#), build, reallyUnsafePtrEquality#, tagToEnum#) - import Prelude hiding (filter, foldr, lookup, map, null, pred) - - import qualified Data.HashMap.Array as A -@@ -1072,5 +1072,5 @@ fullNodeMask = complement (complement 0 `unsafeShiftL` maxChildren) - -- | Check if two the two arguments are the same value. N.B. This - -- function might give false negatives (due to GC moving objects.) - ptrEq :: a -> a -> Bool --ptrEq x y = reallyUnsafePtrEquality# x y ==# 1# -+ptrEq x y = tagToEnum# (reallyUnsafePtrEquality# x y ==# 1#) - {-# INLINE ptrEq #-} --- -1.7.10.4 - diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index b86d780a2..3d01cc301 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -68,7 +68,6 @@ install_pkgs () { patched MissingH patched bloomfilter patched SafeSemaphore - patched unordered-containers patched comonad patched HTTP patched MonadCatchIO-transformers |