[Git][ghc/ghc][wip/alpine-ci] 2 commits: base/Event/Poll: Drop POLLRDHUP enum item

[Ben Gamari]

Ben Gamari pushed to branch wip/alpine-ci at Glasgow Haskell Compiler / GHC


Commits:
59a5b904 by Ben Gamari at 2019-06-11T04:53:22Z
base/Event/Poll: Drop POLLRDHUP enum item

Previously the Event enumeration produced by hsc2hs would sometimes
include a currently-unused POLLRDHUP item. This unused binding would
result in a build failure. Drop it.

- - - - -
b6b82027 by Ben Gamari at 2019-06-11T04:53:22Z
XXX: Test alpine job

- - - - -


2 changed files:

- .gitlab-ci.yml
- libraries/base/GHC/Event/Poll.hsc


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -541,7 +541,7 @@ release-x86_64-linux-deb8:
 
 release-x86_64-linux-alpine:
   extends: .validate-linux
-  stage: full-build
+  stage: lint
   image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-alpine:$DOCKER_REV"
   variables:
     BUILD_SPHINX_PDF: "NO"
@@ -549,8 +549,6 @@ release-x86_64-linux-alpine:
     BIN_DIST_PREP_TAR_COMP: "bindistprep/ghc-x86_64-alpine-linux.tar.xz"
     # Can't use ld.gold due to #13958.
     CONFIGURE_ARGS: "--disable-ld-override"
-  only:
-    - tags
   cache:
     key: linux-x86_64-alpine
   artifacts:


=====================================
libraries/base/GHC/Event/Poll.hsc
=====================================
@@ -162,24 +162,12 @@ newtype Event = Event CShort
              , FiniteBits -- ^ @since 4.7.0.0
              )
 
--- We have to duplicate the whole enum like this in order for the
--- hsc2hs cross-compilation mode to work
-#if defined(POLLRDHUP)
 #{enum Event, Event
  , pollIn    = POLLIN
  , pollOut   = POLLOUT
- , pollRdHup = POLLRDHUP
  , pollErr   = POLLERR
  , pollHup   = POLLHUP
  }
-#else
-#{enum Event, Event
- , pollIn    = POLLIN
- , pollOut   = POLLOUT
- , pollErr   = POLLERR
- , pollHup   = POLLHUP
- }
-#endif
 
 fromEvent :: E.Event -> Event
 fromEvent e = remap E.evtRead  pollIn .|.



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/36735b86d76decd1b84f57106c8d79e082e69e07...b6b8202744b8aea160fae39d977b04ad32f4f3a5

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/compare/36735b86d76decd1b84f57106c8d79e082e69e07...b6b8202744b8aea160fae39d977b04ad32f4f3a5
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20190611/5995d570/attachment-0001.html>