[Pkg-haskell-commits] darcs: ghc: Remove ./patches/do_not_use_epoll_create1, applied upstream

[Joachim Breitner]

Sat Jul 30 14:36:02 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Remove ./patches/do_not_use_epoll_create1, applied upstream
  Ignore-this: 502fc5c5686ce0ebe3c19d8ab79aefe1

    R ./patches/do_not_use_epoll_create1
    M ./patches/series -1

Sat Jul 30 14:36:02 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Remove ./patches/do_not_use_epoll_create1, applied upstream
  Ignore-this: 502fc5c5686ce0ebe3c19d8ab79aefe1
diff -rN -u old-ghc//patches/do_not_use_epoll_create1 new-ghc//patches/do_not_use_epoll_create1
--- old-ghc//patches/do_not_use_epoll_create1	2012-02-03 16:37:09.595252405 +0000
+++ new-ghc//patches/do_not_use_epoll_create1	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-Index: ghc-7.0.2/libraries/base/System/Event/EPoll.hsc
-===================================================================
---- ghc-7.0.2.orig/libraries/base/System/Event/EPoll.hsc	2011-03-09 21:31:56.000000000 +0530
-+++ ghc-7.0.2/libraries/base/System/Event/EPoll.hsc	2011-03-09 21:31:57.000000000 +0530
-@@ -47,9 +47,7 @@
- import GHC.Real (ceiling, fromIntegral)
- import GHC.Show (Show)
- import System.Posix.Internals (c_close)
--#if !defined(HAVE_EPOLL_CREATE1)
- import System.Posix.Internals (setCloseOnExec)
--#endif
- import System.Posix.Types (Fd(..))
- 
- import qualified System.Event.Array    as A
-@@ -159,12 +157,8 @@
- epollCreate :: IO EPollFd
- epollCreate = do
-   fd <- throwErrnoIfMinus1 "epollCreate" $
--#if defined(HAVE_EPOLL_CREATE1)
--        c_epoll_create1 (#const EPOLL_CLOEXEC)
--#else
-         c_epoll_create 256 -- argument is ignored
-   setCloseOnExec fd
--#endif
-   let !epollFd' = EPollFd fd
-   return epollFd'
- 
-@@ -196,13 +190,8 @@
- fromTimeout Forever     = -1
- fromTimeout (Timeout s) = ceiling $ 1000 * s
- 
--#if defined(HAVE_EPOLL_CREATE1)
--foreign import ccall unsafe "sys/epoll.h epoll_create1"
--    c_epoll_create1 :: CInt -> IO CInt
--#else
- foreign import ccall unsafe "sys/epoll.h epoll_create"
-     c_epoll_create :: CInt -> IO CInt
--#endif
- 
- foreign import ccall unsafe "sys/epoll.h epoll_ctl"
-     c_epoll_ctl :: CInt -> CInt -> CInt -> Ptr Event -> IO CInt
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2012-02-03 16:37:09.591247119 +0000
+++ new-ghc//patches/series	2012-02-03 16:37:12.167249203 +0000
@@ -4,7 +4,6 @@
 haddock-hardcode-ghc-paths
 use-debian-gen_contents_index
 haddock-no-library
-do_not_use_epoll_create1
 lpthread-bootstrap-workaround
 configure-s390x
 autoconf