on iko/ghcjs-patch-master help sign in
Update ghci-no-dynamic-linking.patch
commit582018f19592b78a0c702d42828c3caa3c9cec55 authorMoritz Angermann <moritz.angermann@gmail.com> dateMon 25 May 2020, 18:21 (6 years ago) parent4ba95c0
1 file changed−37
overlays/patches/ghc/ghci-no-dynamic-linking.patch−37
overlays/patches/ghc/ghci-no-dynamic-linking.patch−37
@@ -353,43 +353,6 @@ index 4020aef0d9..db6b4b954a 100644
353353 /* ----------------------------------------------------------------------------
354354 Implementations
355355 ------------------------------------------------------------------------- */
356−diff --git a/libraries/base/GHC/Event/Manager.hs b/libraries/base/GHC/Event/Manager.hs
357−index 3ee9116812..51306795fe 100644
358−--- a/libraries/base/GHC/Event/Manager.hs
359−+++ b/libraries/base/GHC/Event/Manager.hs
360−@@ -150,9 +150,7 @@ callbackTableVar mgr fd = emFds mgr ! hashFd fd
361−
362− haveOneShot :: Bool
363− {-# INLINE haveOneShot #-}
364−-#if defined(darwin_HOST_OS) || defined(ios_HOST_OS)
365−-haveOneShot = False
366−-#elif defined(HAVE_EPOLL) || defined(HAVE_KQUEUE)
367−+#if defined(HAVE_EPOLL) || defined(HAVE_KQUEUE)
368− haveOneShot = True
369− #else
370− haveOneShot = False
371−@@ -365,20 +363,9 @@ registerFd mgr cb fd evs lt = do
372− return r
373− {-# INLINE registerFd #-}
374−
375−-{-
376−- Building GHC with parallel IO manager on Mac freezes when
377−- compiling the dph libraries in the phase 2. As workaround, we
378−- don't use oneshot and we wake up an IO manager on Mac every time
379−- when we register an event.
380−-
381−- For more information, please read:
382−- http://ghc.haskell.org/trac/ghc/ticket/7651
383−--}
384− -- | Wake up the event manager.
385− wakeManager :: EventManager -> IO ()
386−-#if defined(darwin_HOST_OS) || defined(ios_HOST_OS)
387−-wakeManager mgr = sendWakeup (emControl mgr)
388−-#elif defined(HAVE_EPOLL) || defined(HAVE_KQUEUE)
389−+#if defined(HAVE_EPOLL) || defined(HAVE_KQUEUE)
390− wakeManager _ = return ()
391− #else
392− wakeManager mgr = sendWakeup (emControl mgr)
393356diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
394357index a95f1ecaa8..4866490899 100644
395358--- a/libraries/ghc-prim/ghc-prim.cabal