[Git][ghc/ghc][master] 5 commits: Bump unix submodule to 2.8.0.0

Marge Bot (@marge-bot) gitlab at gitlab.haskell.org
Mon Nov 7 18:22:03 UTC 2022



Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
e41b2f55 by Matthew Pickering at 2022-11-05T14:18:10+00:00
Bump unix submodule to 2.8.0.0

Also bumps process and ghc-boot bounds on unix.

For hadrian, when cross-compiling, we add -Wwarn=unused-imports
-Wwarn=unused-top-binds to validation flavour. Further fixes in unix
and/or hsc2hs is needed to make it completely free of warnings; for
the time being, this change is needed to unblock other
cross-compilation related work.

- - - - -
42938a58 by Matthew Pickering at 2022-11-05T14:18:10+00:00
Bump Win32 submodule to 2.13.4.0

Fixes #22098

- - - - -
e7372bc5 by Cheng Shao at 2022-11-06T13:15:22+00:00
Bump ci-images revision

ci-images has recently been updated, including changes needed for wasm32-wasi CI.

- - - - -
88cb9492 by Cheng Shao at 2022-11-06T13:15:22+00:00
Bump gmp-tarballs submodule

Includes a fix for wasm support, doesn't impact other targets.

- - - - -
69427ce9 by Cheng Shao at 2022-11-06T13:15:22+00:00
Bump haskeline submodule

Includes a fix for wasm support, doesn't impact other targets.

- - - - -


11 changed files:

- .gitlab-ci.yml
- compiler/ghc.cabal.in
- ghc/ghc-bin.cabal.in
- hadrian/src/Flavour.hs
- libraries/Win32
- libraries/base/tests/T7773.hs
- libraries/ghc-bignum/gmp/gmp-tarballs
- libraries/ghc-boot/ghc-boot.cabal.in
- libraries/haskeline
- libraries/process
- libraries/unix


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -2,7 +2,7 @@ variables:
   GIT_SSL_NO_VERIFY: "1"
 
   # Commit of ghc/ci-images repository from which to pull Docker images
-  DOCKER_REV: 9e4c540d9e4972a36291dfdf81f079f37d748890
+  DOCKER_REV: 205afce5c7ebdb8666b96638f6758fe527f40a7f
 
   # Sequential version number of all cached things.
   # Bump to invalidate GitLab CI cache.


=====================================
compiler/ghc.cabal.in
=====================================
@@ -96,7 +96,7 @@ Library
                    ghci == @ProjectVersionMunged@
 
     if os(windows)
-        Build-Depends: Win32  >= 2.3 && < 2.13
+        Build-Depends: Win32  >= 2.3 && < 2.14
     else
         if flag(terminfo)
             Build-Depends: terminfo == 0.4.*


=====================================
ghc/ghc-bin.cabal.in
=====================================
@@ -43,7 +43,7 @@ Executable ghc
                    ghc           == @ProjectVersionMunged@
 
     if os(windows)
-        Build-Depends: Win32  >= 2.3 && < 2.13
+        Build-Depends: Win32  >= 2.3 && < 2.14
     else
         Build-Depends: unix   >= 2.7 && < 2.9
 


=====================================
hadrian/src/Flavour.hs
=====================================
@@ -33,6 +33,7 @@ import Text.Parsec.Combinator as P
 import Text.Parsec.Char as P
 import Control.Monad.Except
 import UserSettings
+import Oracles.Flag
 import Oracles.Setting
 
 
@@ -106,8 +107,13 @@ addArgs args' fl = fl { args = args fl <> args' }
 
 -- | Turn on -Werror for packages built with the stage1 compiler.
 -- It mimics the CI settings so is useful to turn on when developing.
+
+-- TODO: the -Wwarn flags are added to make validation flavour works
+-- for cross-compiling unix-2.8.0.0. There needs to be further fixes
+-- in unix and/or hsc2hs to make cross-compiling unix completely free
+-- from warnings.
 werror :: Flavour -> Flavour
-werror = addArgs (builder Ghc ? notStage0 ? arg "-Werror")
+werror = addArgs (builder Ghc ? notStage0 ? mconcat [arg "-Werror", flag CrossCompiling ? mconcat [arg "-Wwarn=unused-imports", arg "-Wwarn=unused-top-binds"]])
 
 -- | Build C and Haskell objects with debugging information.
 enableDebugInfo :: Flavour -> Flavour


=====================================
libraries/Win32
=====================================
@@ -1 +1 @@
-Subproject commit e6c0c0f44f6dfc2f8255fc4a5017f4ab67cd0242
+Subproject commit 931497f7052f63cb5cfd4494a94e572c5c570642


=====================================
libraries/base/tests/T7773.hs
=====================================
@@ -3,7 +3,6 @@ import System.Posix.IO
 
 main = do
   putStrLn "hello"
-  fd <- openFd "/dev/random" ReadOnly Nothing defaultFileFlags
+  fd <- openFd "/dev/random" ReadOnly defaultFileFlags
   threadWaitRead fd
   putStrLn "goodbye"
-


=====================================
libraries/ghc-bignum/gmp/gmp-tarballs
=====================================
@@ -1 +1 @@
-Subproject commit 31f9909680ba8fe00d27fd8a6f5d198a0a96c1ac
+Subproject commit 6bbea995472b6f4db172c3cd50aa3f515ddd221c


=====================================
libraries/ghc-boot/ghc-boot.cabal.in
=====================================
@@ -80,4 +80,4 @@ Library
                    ghc-boot-th == @ProjectVersionMunged@
     if !os(windows)
         build-depends:
-                   unix       >= 2.7 && < 2.8
+                   unix       >= 2.7 && < 2.9


=====================================
libraries/haskeline
=====================================
@@ -1 +1 @@
-Subproject commit aae0bfeec7ae767e3c30844ca2f99b6825185467
+Subproject commit d4f343509e905a717ea463ad84462c126d8990d8


=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit 2ac3ff366631a36d84101000045abbefa4415b15
+Subproject commit cb89d5079d29c38683bcb6feec7dc53ad3836ed0


=====================================
libraries/unix
=====================================
@@ -1 +1 @@
-Subproject commit 2a6079a2b76adf29d3e3ff213dffe66cabcb76c3
+Subproject commit 3be0223cee7395410915a127eba3acae5ff0b2f2



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3c0e379322965aa87b14923f6d8e1ef5cd677925...69427ce964758b325abd881b4b3db8d59fecc878

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3c0e379322965aa87b14923f6d8e1ef5cd677925...69427ce964758b325abd881b4b3db8d59fecc878
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/20221107/be072c0a/attachment-0001.html>


More information about the ghc-commits mailing list