The package rpms/ghc9.4.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/ghc9.4.git/commit/?id=ae716f509224b9....
Change: -%ifarch armv7hl
Thanks.
Full change: ============
commit c50e6daf4b4a1ace021b0bdb739847aef61856a0 Author: Jens Petersen petersen@redhat.com Date: Sun Jun 26 00:17:02 2022 +0800
9.4.1-alpha3
diff --git a/.gitignore b/.gitignore index 50b39dc..df51c2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ghc-9.4.0.20220501-src.tar.lz /ghc-9.4.0.20220523-src.tar.lz +/ghc-9.4.0.20220623-src.tar.lz diff --git a/8170.patch b/8170.patch deleted file mode 100644 index 7a8daa8..0000000 --- a/8170.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 815b44b7428d30adaf2d5110ac066ffd32d748c7 Mon Sep 17 00:00:00 2001 -From: Jens Petersen juhpetersen@gmail.com -Date: Fri, 6 May 2022 18:11:19 +0000 -Subject: [PATCH] avoid hadrian/bindist/Makefile install_docs error when - --docs=none - -When docs are disabled the bindist does not have docs/ and hence docs-utils/ is not generated. -Here we just test that docs-utils exists before attempting to install prologue.txt and gen_contents_index -to avoid the error: - -/usr/bin/install: cannot stat 'docs-utils/prologue.txt': No such file or directory -make: *** [Makefile:195: install_docs] Error 1 ---- - hadrian/bindist/Makefile | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile -index 5290a5e9df91..f4b0a64e0385 100644 ---- a/hadrian/bindist/Makefile -+++ b/hadrian/bindist/Makefile -@@ -193,9 +193,10 @@ install_docs: - for i in $(DOCS); do \ - cp -R $$i "$(docdir)/"; \ - done -- -- $(INSTALL_DATA) docs-utils/prologue.txt "$(docdir)/html/libraries/" -- $(INSTALL_SCRIPT) docs-utils/gen_contents_index "$(docdir)/html/libraries/" -+ if [ -d docs-utils ]; then \ -+ $(INSTALL_DATA) docs-utils/prologue.txt "$(docdir)/html/libraries/"; \ -+ $(INSTALL_SCRIPT) docs-utils/gen_contents_index "$(docdir)/html/libraries/"; \ -+ fi - - BINARY_NAMES=$(shell ls ./wrappers/) - install_wrappers: install_bin_libdir --- -GitLab - diff --git a/8332.patch b/8332.patch deleted file mode 100644 index 82cb0fe..0000000 --- a/8332.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 00ceef6f9e765f794e6b9c91478327e5cca9b788 Mon Sep 17 00:00:00 2001 -From: Ben Gamari ben@smart-cactus.org -Date: Tue, 24 May 2022 14:50:53 -0400 -Subject: [PATCH] configure: Bump minimum bootstrap compiler version to 9.0 - -Fixes #21633. ---- - configure.ac | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9bcfae04c613..2f3a9f88cb12 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -226,8 +226,12 @@ if test "$WithGhc" = "" - then - AC_MSG_ERROR([GHC is required.]) - fi --FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[8.10], -- [AC_MSG_ERROR([GHC version 8.10 or later is required to compile GHC.])]) -+ -+dnl ** Check minimum required bootstrap version. N.B. We currently allow -+dnl bootstrapping with the last two major releases. -+MinBootGhcVersion="9.0" -+FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[$MinBootGhcVersion], -+ [AC_MSG_ERROR([GHC version $MinBootGhcVersion or later is required to compile GHC.])]) - - if test `expr $GhcMinVersion % 2` = "1" - then --- -GitLab - diff --git a/8339.patch b/8339.patch deleted file mode 100644 index 0215ca6..0000000 --- a/8339.patch +++ /dev/null @@ -1,1100 +0,0 @@ -From 172b87018ef20d1347745b9702cf330a57884780 Mon Sep 17 00:00:00 2001 -From: Matthew Pickering matthewtpickering@gmail.com -Date: Wed, 25 May 2022 16:22:35 +0100 -Subject: [PATCH 1/2] hadrian: Introduce new package database for executables - needed to build stage0 - -These executables (such as hsc2hs) are built using the boot compiler and -crucially, most libraries from the global package database. - -We also move other build-time executables to be built in this stage such -as linters which also cleans up which libraries end up in the global -package database. This allows us to remove hacks where linters-common is -removed from the package database when a bindist is created. - -This fixes issues caused by infinite recursion due to bytestring adding -a dependency on template-haskell. - -Fixes #21634 ---- - .gitlab-ci.yml | 8 +- - hadrian/src/Builder.hs | 38 ++++----- - hadrian/src/Context.hs | 2 +- - hadrian/src/Expression.hs | 8 +- - hadrian/src/Flavour.hs | 4 +- - hadrian/src/Hadrian/BuildPath.hs | 8 +- - hadrian/src/Oracles/Setting.hs | 16 ++-- - hadrian/src/Oracles/TestSettings.hs | 2 +- - hadrian/src/Rules.hs | 12 +-- - hadrian/src/Rules/BinaryDist.hs | 11 --- - hadrian/src/Rules/Clean.hs | 2 +- - hadrian/src/Rules/Generate.hs | 23 ++++-- - hadrian/src/Rules/Libffi.hs | 2 +- - hadrian/src/Rules/Program.hs | 18 ++--- - hadrian/src/Rules/Register.hs | 5 +- - hadrian/src/Rules/Rts.hs | 2 +- - hadrian/src/Rules/Selftest.hs | 6 +- - hadrian/src/Rules/SimpleTargets.hs | 11 +-- - hadrian/src/Rules/SourceDist.hs | 16 ++-- - hadrian/src/Rules/Test.hs | 18 ++--- - hadrian/src/Rules/ToolArgs.hs | 14 ++-- - hadrian/src/Settings/Builders/Cabal.hs | 6 +- - hadrian/src/Settings/Builders/Ghc.hs | 2 +- - hadrian/src/Settings/Builders/GhcPkg.hs | 2 +- - hadrian/src/Settings/Builders/Hsc2Hs.hs | 8 +- - hadrian/src/Settings/Builders/Make.hs | 2 +- - hadrian/src/Settings/Builders/RunTest.hs | 8 +- - hadrian/src/Settings/Default.hs | 30 ++++---- - hadrian/src/Settings/Flavours/Development.hs | 11 ++- - hadrian/src/Settings/Packages.hs | 2 +- - hadrian/src/Settings/Program.hs | 7 +- - hadrian/src/Stage.hs | 81 ++++++++++++++++++-- - 32 files changed, 236 insertions(+), 149 deletions(-) - -diff --git a/hadrian/src/Builder.hs b/hadrian/src/Builder.hs -index 160eb44f7a3..ed392486e50 100644 ---- a/hadrian/src/Builder.hs -+++ b/hadrian/src/Builder.hs -@@ -199,18 +199,20 @@ instance NFData Builder - -- 'Stage' and GHC 'Package'). - builderProvenance :: Builder -> Maybe Context - builderProvenance = \case -- DeriveConstants -> context Stage0 deriveConstants -- GenApply -> context Stage0 genapply -- GenPrimopCode -> context Stage0 genprimopcode -- Ghc _ Stage0 -> Nothing -- Ghc _ stage -> context (pred stage) ghc -- GhcPkg _ Stage0 -> Nothing -- GhcPkg _ s -> context (pred s) ghcPkg -+ DeriveConstants -> context stage0Boot deriveConstants -+ GenApply -> context stage0Boot genapply -+ GenPrimopCode -> context stage0Boot genprimopcode -+ Ghc _ (Stage0 {})-> Nothing -+ Ghc _ stage -> context (predStage stage) ghc -+ GhcPkg _ (Stage0 {}) -> Nothing -+ GhcPkg _ s -> context (predStage s) ghcPkg - Haddock _ -> context Stage1 haddock -+ Hsc2Hs _ -> context stage0Boot hsc2hs -+ Unlit -> context stage0Boot unlit -+ -+ -- Never used - Hpc -> context Stage1 hpcBin -- Hp2Ps -> context Stage0 hp2ps -- Hsc2Hs _ -> context Stage0 hsc2hs -- Unlit -> context Stage0 unlit -+ Hp2Ps -> context stage0Boot hp2ps - _ -> Nothing - where - context s p = Just $ vanillaContext s p -@@ -226,19 +228,19 @@ instance H.Builder Builder where - Autoreconf dir -> return [dir -/- "configure.ac"] - Configure dir -> return [dir -/- "configure"] - -- Ghc _ Stage0 -> do -+ Ghc _ (Stage0 {}) -> do - -- Read the boot GHC version here to make sure we rebuild when it - -- changes (#18001). - _bootGhcVersion <- setting GhcVersion - pure [] - Ghc _ stage -> do - root <- buildRoot -- touchyPath <- programPath (vanillaContext Stage0 touchy) -+ touchyPath <- programPath (vanillaContext (Stage0 InTreeLibs) touchy) - unlitPath <- builderPath Unlit - - -- GHC from the previous stage is used to build artifacts in the - -- current stage. Need the previous stage's GHC deps. -- ghcdeps <- ghcBinDeps (pred stage) -+ ghcdeps <- ghcBinDeps (predStage stage) - - return $ [ unlitPath ] - ++ ghcdeps -@@ -396,15 +398,15 @@ isOptional = \case - systemBuilderPath :: Builder -> Action FilePath - systemBuilderPath builder = case builder of - Alex -> fromKey "alex" -- Ar _ Stage0 -> fromKey "system-ar" -+ Ar _ (Stage0 {})-> fromKey "system-ar" - Ar _ _ -> fromKey "ar" - Autoreconf _ -> stripExe =<< fromKey "autoreconf" -- Cc _ Stage0 -> fromKey "system-cc" -+ Cc _ (Stage0 {}) -> fromKey "system-cc" - Cc _ _ -> fromKey "cc" - -- We can't ask configure for the path to configure! - Configure _ -> return "configure" -- Ghc _ Stage0 -> fromKey "system-ghc" -- GhcPkg _ Stage0 -> fromKey "system-ghc-pkg" -+ Ghc _ (Stage0 {}) -> fromKey "system-ghc" -+ GhcPkg _ (Stage0 {}) -> fromKey "system-ghc-pkg" - Happy -> fromKey "happy" - HsCpp -> fromKey "hs-cpp" - Ld _ -> fromKey "ld" -@@ -416,7 +418,7 @@ systemBuilderPath builder = case builder of - -- parameters. E.g. building a cross-compiler on and for x86_64 - -- which will target ppc64 means that MergeObjects Stage0 will use - -- x86_64 linker and MergeObject _ will use ppc64 linker. -- MergeObjects Stage0 -> fromKey "system-merge-objects" -+ MergeObjects (Stage0 {}) -> fromKey "system-merge-objects" - MergeObjects _ -> fromKey "merge-objects" - Make _ -> fromKey "make" - Makeinfo -> fromKey "makeinfo" -diff --git a/hadrian/src/Context.hs b/hadrian/src/Context.hs -index ad6ead3f9b7..ae1f3299733 100644 ---- a/hadrian/src/Context.hs -+++ b/hadrian/src/Context.hs -@@ -57,7 +57,7 @@ libPath Context {..} = buildRoot <&> (-/- (stageString stage -/- "lib")) - distDir :: Stage -> Action FilePath - distDir st = do - let (os,arch) = case st of -- Stage0 -> (HostOs , HostArch) -+ Stage0 {} -> (HostOs , HostArch) - _ -> (TargetOs, TargetArch) - version <- ghcVersionStage st - hostOs <- cabalOsString <$> setting os -diff --git a/hadrian/src/Expression.hs b/hadrian/src/Expression.hs -index 3d6b9b896cd..14b08cb0e98 100644 ---- a/hadrian/src/Expression.hs -+++ b/hadrian/src/Expression.hs -@@ -111,7 +111,10 @@ compiler. - - -- | Is the build currently in stage 0? - stage0 :: Predicate --stage0 = stage Stage0 -+stage0 = p <$> getStage -+ where -+ p (Stage0 {}) = True -+ p _ = False - - -- | Is the build currently in stage 1? - stage1 :: Predicate -@@ -123,7 +126,8 @@ stage2 = stage Stage2 - - -- | Is the build /not/ in stage 0 right now? - notStage0 :: Predicate --notStage0 = notM stage0 -+notStage0 = notM Expression.stage0 -+ - - -- | Whether or not the bootstrapping compiler provides a threaded RTS. We need - -- to know this when building stage 1, since stage 1 links against the -diff --git a/hadrian/src/Flavour.hs b/hadrian/src/Flavour.hs -index 46fdd9abaff..0d3175525d4 100644 ---- a/hadrian/src/Flavour.hs -+++ b/hadrian/src/Flavour.hs -@@ -517,7 +517,7 @@ builderSetting = - , ("deps", FindCDependencies CDep) - ] - -- stages = map (\stg -> (stageString stg, stg)) [minBound..maxBound] -+ stages = map (\stg -> (stageString stg, stg)) allStages - - pkgs = map (\pkg -> (pkgName pkg, pkg)) (ghcPackages ++ userPackages) - -diff --git a/hadrian/src/Hadrian/BuildPath.hs b/hadrian/src/Hadrian/BuildPath.hs -index 8e059ce7d49..8d2806b5879 100644 ---- a/hadrian/src/Hadrian/BuildPath.hs -+++ b/hadrian/src/Hadrian/BuildPath.hs -@@ -72,10 +72,10 @@ parseGhcPkgPath root after = do - -- To be kept in sync with Stage.hs's stageString function - -- | Parse @"stageX"@ into a 'Stage'. - parseStage :: Parsec.Parsec String () Stage --parseStage = (Parsec.string "stage" *> Parsec.choice -- [ Parsec.string (show n) $> toEnum n -- | n <- map fromEnum [minBound .. maxBound :: Stage] -- ]) Parsec.<?> "stage string" -+parseStage = Parsec.choice -+ [ n <$ Parsec.try (Parsec.string (stageString n)) -+ | n <- allStages -+ ] Parsec.<?> "stage string" - - -- To be kept in sync with the show instances in 'Way.Type', until we perhaps - -- use some bidirectional parsing/pretty printing approach or library. -diff --git a/hadrian/src/Oracles/Setting.hs b/hadrian/src/Oracles/Setting.hs -index 62a1ebcd67a..dca0861869a 100644 ---- a/hadrian/src/Oracles/Setting.hs -+++ b/hadrian/src/Oracles/Setting.hs -@@ -182,15 +182,19 @@ setting key = lookupSystemConfig $ case key of - TargetHasRtsLinker -> "target-has-rts-linker" - BourneShell -> "bourne-shell" - -+bootIsStage0 :: Stage -> Stage -+bootIsStage0 (Stage0 {}) = Stage0 InTreeLibs -+bootIsStage0 s = s -+ - -- | Look up the value of a 'SettingList' in @cfg/system.config@, tracking the - -- result. - settingList :: SettingList -> Action [String] - settingList key = fmap words $ lookupSystemConfig $ case key of -- ConfCcArgs stage -> "conf-cc-args-" ++ stageString stage -- ConfCppArgs stage -> "conf-cpp-args-" ++ stageString stage -- ConfGccLinkerArgs stage -> "conf-gcc-linker-args-" ++ stageString stage -- ConfLdLinkerArgs stage -> "conf-ld-linker-args-" ++ stageString stage -- ConfMergeObjectsArgs stage -> "conf-merge-objects-args-" ++ stageString stage -+ ConfCcArgs stage -> "conf-cc-args-" ++ stageString (bootIsStage0 stage) -+ ConfCppArgs stage -> "conf-cpp-args-" ++ stageString (bootIsStage0 stage) -+ ConfGccLinkerArgs stage -> "conf-gcc-linker-args-" ++ stageString (bootIsStage0 stage) -+ ConfLdLinkerArgs stage -> "conf-ld-linker-args-" ++ stageString (bootIsStage0 stage) -+ ConfMergeObjectsArgs stage -> "conf-merge-objects-args-" ++ stageString (bootIsStage0 stage) - HsCppArgs -> "hs-cpp-args" - - -- | Look up the value of a 'SettingList' in @cfg/system.config@, tracking the -@@ -316,7 +320,7 @@ topDirectory :: Action FilePath - topDirectory = fixAbsolutePathOnWindows =<< setting GhcSourcePath - - ghcVersionStage :: Stage -> Action String --ghcVersionStage Stage0 = setting GhcVersion -+ghcVersionStage (Stage0 {}) = setting GhcVersion - ghcVersionStage _ = setting ProjectVersion - - -- | The file suffix used for libraries of a given build 'Way'. For example, -diff --git a/hadrian/src/Oracles/TestSettings.hs b/hadrian/src/Oracles/TestSettings.hs -index 79564914148..5a27e0c5fb0 100644 ---- a/hadrian/src/Oracles/TestSettings.hs -+++ b/hadrian/src/Oracles/TestSettings.hs -@@ -118,7 +118,7 @@ fullPath stage pkg = programPath =<< programContext stage pkg - -- stage 1 ghc lives under stage0/bin, - -- stage 2 ghc lives under stage1/bin, etc - stageOfTestCompiler :: String -> Maybe Stage --stageOfTestCompiler "stage1" = Just Stage0 -+stageOfTestCompiler "stage1" = Just stage0InTree - stageOfTestCompiler "stage2" = Just Stage1 - stageOfTestCompiler "stage3" = Just Stage2 - stageOfTestCompiler _ = Nothing -diff --git a/hadrian/src/Rules.hs b/hadrian/src/Rules.hs -index 521c0ac154a..9b432b89662 100644 ---- a/hadrian/src/Rules.hs -+++ b/hadrian/src/Rules.hs -@@ -32,16 +32,12 @@ import Settings.Program (programContext) - import Target - import UserSettings - -- --allStages :: [Stage] --allStages = [minBound .. maxBound] -- - -- | This rule calls 'need' on all top-level build targets that Hadrian builds - -- by default, respecting the 'finalStage' flag. - topLevelTargets :: Rules () - topLevelTargets = action $ do - verbosity <- getVerbosity -- forM_ [ Stage1 ..] $ \stage -> do -+ forM_ [ Stage1, Stage2, Stage3] $ \stage -> do - when (verbosity >= Verbose) $ do - (libraries, programs) <- partition isLibrary <$> stagePackages stage - libNames <- mapM (name stage) libraries -@@ -52,14 +48,14 @@ topLevelTargets = action $ do - putInfo . unlines $ - [ stageHeader "libraries" libNames - , stageHeader "programs" pgmNames ] -- let buildStages = [ s | s <- [Stage0 ..], s < finalStage ] -+ let buildStages = [ s | s <- allStages, s < finalStage ] - targets <- concatForM buildStages $ \stage -> do - packages <- stagePackages stage - mapM (path stage) packages - - -- Why we need wrappers: https://gitlab.haskell.org/ghc/ghc/issues/16534. - root <- buildRoot -- let wrappers = [ root -/- ("ghc-" ++ stageString s) | s <- [Stage1 ..] -+ let wrappers = [ root -/- ("ghc-" ++ stageString s) | s <- [Stage1, Stage2, Stage3] - , s < finalStage ] - need (targets ++ wrappers) - where -@@ -117,7 +113,7 @@ packageRules = do - Rules.Program.buildProgramRules readPackageDb - Rules.Register.configurePackageRules - -- forM_ [Stage0 ..] (Rules.Register.registerPackageRules writePackageDb) -+ forM_ allStages (Rules.Register.registerPackageRules writePackageDb) - - -- TODO: Can we get rid of this enumeration of contexts? Since we iterate - -- over it to generate all 4 types of rules below, all the time, we -diff --git a/hadrian/src/Rules/BinaryDist.hs b/hadrian/src/Rules/BinaryDist.hs -index 9c98c85371a..39026430799 100644 ---- a/hadrian/src/Rules/BinaryDist.hs -+++ b/hadrian/src/Rules/BinaryDist.hs -@@ -204,17 +204,6 @@ bindistRules = do - cmd_ (bindistFilesDir -/- "bin" -/- ghcPkgName) ["recache"] - - -- -- HACK: Drop stuff from lintersCommon package as this for GHC developers and not of interest to end-users (#21203) -- pkg_id <- pkgIdentifier lintersCommon -- cmd_ (bindistFilesDir -/- "bin" -/- ghcPkgName) ["unregister", pkg_id] -- removeDirectory (bindistFilesDir -/- "lib" -/- distDir -/- pkg_id) -- -- removeFile =<< -- ((bindistFilesDir -/- "lib" -/- distDir) -/-) -- <$> pkgRegisteredLibraryFileName (Context Stage1 lintersCommon dynamic) -- -- -- - -- The settings file must be regenerated by the bindist installation - -- logic to account for the environment discovered by the bindist - -- configure script on the host. Not on Windows, however, where -diff --git a/hadrian/src/Rules/Clean.hs b/hadrian/src/Rules/Clean.hs -index 26a279d1780..19e7f3be5b2 100644 ---- a/hadrian/src/Rules/Clean.hs -+++ b/hadrian/src/Rules/Clean.hs -@@ -22,7 +22,7 @@ clean = do - cleanSourceTree :: Action () - cleanSourceTree = do - path <- buildRoot -- forM_ [Stage0 ..] $ removeDirectory . (path -/-) . stageString -+ forM_ allStages $ removeDirectory . (path -/-) . stageString - removeDirectory "sdistprep" - - cleanMingwTarballs :: Action () -diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs -index ca96302db37..33a392fc33c 100644 ---- a/hadrian/src/Rules/Generate.hs -+++ b/hadrian/src/Rules/Generate.hs -@@ -55,7 +55,7 @@ rtsDependencies = do - genapplyDependencies :: Expr [FilePath] - genapplyDependencies = do - stage <- getStage -- rtsPath <- expr (rtsBuildPath $ succ stage) -+ rtsPath <- expr (rtsBuildPath $ succStage stage) - ((stage /= Stage3) ?) $ pure $ ((rtsPath -/- "include") -/-) <$> - [ "ghcautoconf.h", "ghcplatform.h" ] - -@@ -175,7 +175,7 @@ genPlatformConstantsHeader context file = do - copyRules :: Rules () - copyRules = do - root <- buildRootRules -- forM_ [Stage0 ..] $ \stage -> do -+ forM_ allStages $ \stage -> do - let prefix = root -/- stageString stage -/- "lib" - - infixl 1 <~ -@@ -203,7 +203,7 @@ generateRules = do - (root -/- "ghc-stage2") <~+ ghcWrapper Stage2 - (root -/- "ghc-stage3") <~+ ghcWrapper Stage3 - -- forM_ [Stage0 ..] $ \stage -> do -+ forM_ allStages $ \stage -> do - let prefix = root -/- stageString stage -/- "lib" - go gen file = generate file (semiEmptyTarget stage) gen - (prefix -/- "settings") %> go generateSettings -@@ -227,11 +227,11 @@ emptyTarget = vanillaContext (error "Rules.Generate.emptyTarget: unknown stage") - -- | GHC wrapper scripts used for passing the path to the right package database - -- when invoking in-tree GHC executables. - ghcWrapper :: Stage -> Expr String --ghcWrapper Stage0 = error "Stage0 GHC does not require a wrapper script to run." -+ghcWrapper (Stage0 {}) = error "Stage0 GHC does not require a wrapper script to run." - ghcWrapper stage = do - dbPath <- expr $ (</>) <$> topDirectory <*> packageDbPath stage - ghcPath <- expr $ (</>) <$> topDirectory -- <*> programPath (vanillaContext (pred stage) ghc) -+ <*> programPath (vanillaContext (predStage stage) ghc) - return $ unwords $ map show $ [ ghcPath ] - ++ (if stage == Stage1 - then ["-no-global-package-db" -@@ -250,7 +250,7 @@ generateGhcPlatformH :: Expr String - generateGhcPlatformH = do - trackGenerateHs - stage <- getStage -- let chooseSetting x y = getSetting $ if stage == Stage0 then x else y -+ let chooseSetting x y = getSetting $ case stage of { Stage0 {} -> x; _ -> y } - buildPlatform <- chooseSetting BuildPlatform HostPlatform - buildArch <- chooseSetting BuildArch HostArch - buildOs <- chooseSetting BuildOs HostOs -@@ -365,7 +365,7 @@ generateSettings = do - generateConfigHs :: Expr String - generateConfigHs = do - stage <- getStage -- let chooseSetting x y = getSetting $ if stage == Stage0 then x else y -+ let chooseSetting x y = getSetting $ case stage of { Stage0 {} -> x; _ -> y } - buildPlatform <- chooseSetting BuildPlatform HostPlatform - hostPlatform <- chooseSetting HostPlatform TargetPlatform - trackGenerateHs -@@ -398,8 +398,15 @@ generateConfigHs = do - , "cBooterVersion = " ++ show cBooterVersion - , "" - , "cStage :: String" -- , "cStage = show (" ++ show (fromEnum stage + 1) ++ " :: Int)" -+ , "cStage = show (" ++ stageString stage ++ " :: Int)" - ] -+ where -+ stageString (Stage0 InTreeLibs) = "1" -+ stageString Stage1 = "2" -+ stageString Stage2 = "3" -+ stageString Stage3 = "4" -+ stageString (Stage0 GlobalLibs) = error "stageString: StageBoot" -+ - - -- | Generate @ghcautoconf.h@ header. - generateGhcAutoconfH :: Expr String -diff --git a/hadrian/src/Rules/Libffi.hs b/hadrian/src/Rules/Libffi.hs -index 8e62461202b..860d06b1166 100644 ---- a/hadrian/src/Rules/Libffi.hs -+++ b/hadrian/src/Rules/Libffi.hs -@@ -156,7 +156,7 @@ libffiRules :: Rules () - libffiRules = do - _ <- addOracleCache $ \ (LibffiDynLibs stage) - -> readFileLines =<< dynLibManifest stage -- forM_ [Stage1 ..] $ \stage -> do -+ forM_ [Stage1, Stage2, Stage3] $ \stage -> do - root <- buildRootRules - let path = root -/- stageString stage - libffiPath = path -/- pkgName libffi -/- "build" -diff --git a/hadrian/src/Rules/Program.hs b/hadrian/src/Rules/Program.hs -index ad91e941cb0..076c22987b1 100644 ---- a/hadrian/src/Rules/Program.hs -+++ b/hadrian/src/Rules/Program.hs -@@ -36,7 +36,7 @@ buildProgramRules rs = do - writeFile' stampPath "OK" - - -- Rules for programs that are actually built by hadrian. -- forM_ [Stage0 ..] $ \stage -> -+ forM_ allStages $ \stage -> - [ root -/- stageString stage -/- "bin" -/- "*" - , root -/- stageString stage -/- "lib/bin" -/- "*" ] |%> \bin -> do - programContexts <- getProgramContexts stage -@@ -78,13 +78,13 @@ lookupProgramContext wholePath progs = lookup (takeFileName wholePath) progs - - buildProgram :: FilePath -> Context -> [(Resource, Int)] -> Action () - buildProgram bin ctx@(Context{..}) rs = do -- -- Custom dependencies: this should be modeled better in the -- -- Cabal file somehow. -- -- TODO: Is this still needed? See 'runtimeDependencies'. -+ - when (package == hsc2hs) $ do - -- 'Hsc2hs' needs the @template-hsc.h@ file. - template <- templateHscPath stage - need [template] -+ -- Custom dependencies: this should be modeled better in the -+ -- Cabal file somehow. - when (package == ghc) $ do - need =<< ghcBinDeps stage - when (package == haddock) $ do -@@ -102,18 +102,18 @@ buildProgram bin ctx@(Context{..}) rs = do - cross <- flag CrossCompiling - -- For cross compiler, copy @stage0/bin/<pgm>@ to @stage1/bin/@. - case (cross, stage) of -- (True, s) | s > Stage0 -> do -- srcDir <- buildRoot <&> (-/- (stageString Stage0 -/- "bin")) -+ (True, s) | s > stage0InTree -> do -+ srcDir <- buildRoot <&> (-/- (stageString stage0InTree -/- "bin")) - copyFile (srcDir -/- takeFileName bin) bin -- (False, s) | s > Stage0 && (package `elem` [touchy, unlit]) -> do -- srcDir <- stageLibPath Stage0 <&> (-/- "bin") -+ (False, s) | s > stage0InTree && (package `elem` [touchy, unlit]) -> do -+ srcDir <- stageLibPath stage0InTree <&> (-/- "bin") - copyFile (srcDir -/- takeFileName bin) bin - _ -> buildBinary rs bin ctx - - buildBinary :: [(Resource, Int)] -> FilePath -> Context -> Action () - buildBinary rs bin context@Context {..} = do - needLibrary =<< contextDependencies context -- when (stage > Stage0) $ do -+ when (stage > stage0InTree) $ do - ways <- interpretInContext context (getLibraryWays <> getRtsWays) - needLibrary [ (rtsContext stage) { way = w } | w <- ways ] - asmSrcs <- interpretInContext context (getContextData asmSrcs) -diff --git a/hadrian/src/Rules/Register.hs b/hadrian/src/Rules/Register.hs -index 8527864f776..64b32283cb0 100644 ---- a/hadrian/src/Rules/Register.hs -+++ b/hadrian/src/Rules/Register.hs -@@ -109,11 +109,12 @@ registerPackageRules rs stage = do - - when (pkg == compiler) $ need =<< ghcLibDeps stage - -- isBoot <- (pkg `notElem`) <$> stagePackages Stage0 -+ -- Only used in guard when Stage0 {} but can be GlobalLibs or InTreeLibs -+ isBoot <- (pkg `notElem`) <$> stagePackages stage - - let ctx = Context stage pkg vanilla - case stage of -- Stage0 | isBoot -> copyConf rs ctx conf -+ Stage0 _ | isBoot -> copyConf rs ctx conf - _ -> buildConf rs ctx conf - - buildConf :: [(Resource, Int)] -> Context -> FilePath -> Action () -diff --git a/hadrian/src/Rules/Rts.hs b/hadrian/src/Rules/Rts.hs -index 9a18a41c46f..cb3026cd32e 100644 ---- a/hadrian/src/Rules/Rts.hs -+++ b/hadrian/src/Rules/Rts.hs -@@ -24,7 +24,7 @@ rtsRules = priority 3 $ do - rtsLibFilePath' - - -- Libffi -- forM_ [Stage1 ..] $ \ stage -> do -+ forM_ [Stage1, Stage2, Stage3 ] $ \ stage -> do - let buildPath = root -/- buildDir (rtsContext stage) - - -- Header files -diff --git a/hadrian/src/Rules/Selftest.hs b/hadrian/src/Rules/Selftest.hs -index bd7e5f95445..eae902013fa 100644 ---- a/hadrian/src/Rules/Selftest.hs -+++ b/hadrian/src/Rules/Selftest.hs -@@ -62,10 +62,10 @@ testDependencies = do - putBuild "==== Dependencies of the 'ghc-bin' binary" - ghcDeps <- pkgDependencies ghc - test $ pkgName compiler `elem` ghcDeps -- stage0Deps <- contextDependencies (vanillaContext Stage0 ghc) -+ stage0Deps <- contextDependencies (vanillaContext stage0InTree ghc) - stage1Deps <- contextDependencies (vanillaContext Stage1 ghc) - stage2Deps <- contextDependencies (vanillaContext Stage2 ghc) -- test $ vanillaContext Stage0 compiler `notElem` stage1Deps -+ test $ vanillaContext stage0InTree compiler `notElem` stage1Deps - test $ vanillaContext Stage1 compiler `elem` stage1Deps - test $ vanillaContext Stage2 compiler `notElem` stage1Deps - test $ stage1Deps /= stage0Deps -@@ -102,7 +102,7 @@ testPackages :: Action () - testPackages = do - putBuild "==== Check system configuration" - putBuild "==== Packages, interpretInContext, configuration flags" -- forM_ [Stage0 ..] $ \stage -> do -+ forM_ allStages $ \stage -> do - pkgs <- stagePackages stage - when (win32 `elem` pkgs) . test $ windowsHost - when (unix `elem` pkgs) . test $ not windowsHost -diff --git a/hadrian/src/Rules/SimpleTargets.hs b/hadrian/src/Rules/SimpleTargets.hs -index e6c42907de0..f89575fccb9 100644 ---- a/hadrian/src/Rules/SimpleTargets.hs -+++ b/hadrian/src/Rules/SimpleTargets.hs -@@ -23,7 +23,7 @@ simplePackageTargets :: Rules () - simplePackageTargets = traverse_ simpleTarget targets - - where targets = [ (stage, target) -- | stage <- [minBound..maxBound] -+ | stage <- allStages - , target <- knownPackages - ] - -@@ -53,10 +53,11 @@ getLibraryPath :: Stage -> Package -> Action FilePath - getLibraryPath stage pkg = pkgConfFile (vanillaContext stage pkg) - - getProgramPath :: Stage -> Package -> Action FilePath --getProgramPath Stage0 _ = -- error ("Cannot build a stage 0 executable target: " ++ -- "it is the boot compiler's toolchain") --getProgramPath stage pkg = programPath (vanillaContext (pred stage) pkg) -+getProgramPath stage pkg = -+ case stage of -+ (Stage0 GlobalLibs) -> error "Can't build executable in stageBoot" -+ (Stage0 InTreeLibs) -> programPath (vanillaContext stage0Boot pkg) -+ s -> programPath (vanillaContext (predStage s) pkg) - - - -- | A phony @autocomplete@ rule that prints all valid setting keys -diff --git a/hadrian/src/Rules/SourceDist.hs b/hadrian/src/Rules/SourceDist.hs -index 69941d5d5ff..a673fb434c5 100644 ---- a/hadrian/src/Rules/SourceDist.hs -+++ b/hadrian/src/Rules/SourceDist.hs -@@ -151,12 +151,12 @@ prepareTree dest = do - - -- (stage, package, input file, output file) - alexHappyFiles = -- [ (Stage0, compiler, "GHC/Cmm/Parser.y", "GHC/Cmm/Parser.hs") -- , (Stage0, compiler, "GHC/Cmm/Lexer.x", "GHC/Cmm/Lexer.hs") -- , (Stage0, compiler, "GHC/Parser.y", "GHC/Parser.hs") -- , (Stage0, compiler, "GHC/Parser/Lexer.x", "GHC/Parser/Lexer.hs") -- , (Stage0, compiler, "GHC/Parser/HaddockLex.x", "GHC/Parser/HaddockLex.hs") -- , (Stage0, hpcBin, "HpcParser.y", "HpcParser.hs") -- , (Stage0, genprimopcode, "Parser.y", "Parser.hs") -- , (Stage0, genprimopcode, "Lexer.x", "Lexer.hs") -+ [ (stage0InTree , compiler, "GHC/Cmm/Parser.y", "GHC/Cmm/Parser.hs") -+ , (stage0InTree , compiler, "GHC/Cmm/Lexer.x", "GHC/Cmm/Lexer.hs") -+ , (stage0InTree , compiler, "GHC/Parser.y", "GHC/Parser.hs") -+ , (stage0InTree , compiler, "GHC/Parser/Lexer.x", "GHC/Parser/Lexer.hs") -+ , (stage0InTree , compiler, "GHC/Parser/HaddockLex.x", "GHC/Parser/HaddockLex.hs") -+ , (stage0InTree , hpcBin, "HpcParser.y", "HpcParser.hs") -+ , (stage0InTree , genprimopcode, "Parser.y", "Parser.hs") -+ , (stage0InTree , genprimopcode, "Lexer.x", "Lexer.hs") - ] -diff --git a/hadrian/src/Rules/Test.hs b/hadrian/src/Rules/Test.hs -index f12d7890b89..23b94295535 100644 ---- a/hadrian/src/Rules/Test.hs -+++ b/hadrian/src/Rules/Test.hs -@@ -66,8 +66,8 @@ checkPrograms = - [ CheckProgram "test:check-ppr" checkPprProgPath checkPprSourcePath checkPprExtra checkPpr id id - , CheckProgram "test:check-exact" checkExactProgPath checkExactSourcePath checkExactExtra checkExact id id - , CheckProgram "test:count-deps" countDepsProgPath countDepsSourcePath countDepsExtra countDeps id id -- , CheckProgram "lint:notes" noteLinterProgPath noteLinterSourcePath noteLinterExtra lintNotes (const Stage0) id -- , CheckProgram "lint:whitespace" whitespaceLinterProgPath whitespaceLinterSourcePath whitespaceLinterExtra lintWhitespace (const Stage0) (filter (/= lintersCommon)) -+ , CheckProgram "lint:notes" noteLinterProgPath noteLinterSourcePath noteLinterExtra lintNotes (const stage0Boot) id -+ , CheckProgram "lint:whitespace" whitespaceLinterProgPath whitespaceLinterSourcePath whitespaceLinterExtra lintWhitespace (const stage0Boot) (filter (/= lintersCommon)) - ] - - inTreeOutTree :: (Stage -> Action b) -> Action b -> Action b -@@ -162,7 +162,7 @@ testRules = do - ghcPath <- getCompilerPath testGhc - whenJust (stageOf testGhc) $ \stg -> - need . (:[]) =<< programPath (Context stg ghc vanilla) -- ghcConfigProgPath <- programPath =<< programContext Stage0 ghcConfig -+ ghcConfigProgPath <- programPath =<< programContext stage0InTree ghcConfig - cwd <- liftIO $ IO.getCurrentDirectory - need [makeRelative cwd ghcPath, ghcConfigProgPath] - cmd [FileStdout $ root -/- ghcConfigPath] ghcConfigProgPath [ghcPath] -@@ -256,7 +256,7 @@ timeoutProgBuilder = do - root <- buildRoot - if windowsHost - then do -- prog <- programPath =<< programContext Stage0 timeout -+ prog <- programPath =<< programContext stage0InTree timeout - copyFile prog (root -/- timeoutPath) - else do - python <- builderPath Python -@@ -272,26 +272,26 @@ needTestsuitePackages :: Stage -> Action () - needTestsuitePackages stg = do - allpkgs <- packages <$> flavour - -- We need the libraries of the successor stage -- libpkgs <- map (Stage1,) . filter isLibrary <$> allpkgs (succ stg) -+ libpkgs <- map (Stage1,) . filter isLibrary <$> allpkgs (succStage stg) - -- And the executables of the current stage - exepkgs <- map (stg,) . filter isProgram <$> allpkgs stg - -- Don't require lib:ghc or lib:cabal when testing the stage1 compiler - -- This is a hack, but a major usecase for testing the stage1 compiler is - -- so that we can use it even if ghc stage2 fails to build - -- Unfortunately, we still need the liba -- let pkgs = filter ((_,p) -> not $ "iserv" `isInfixOf` pkgName p || ((pkgName p `elem` ["ghc", "Cabal"]) && stg == Stage0)) -+ let pkgs = filter ((_,p) -> not $ "iserv" `isInfixOf` pkgName p || ((pkgName p `elem` ["ghc", "Cabal"]) && isStage0 stg)) - (libpkgs ++ exepkgs ++ [ (stg,timeout) | windowsHost ]) - need =<< mapM (uncurry pkgFile) pkgs - cross <- flag CrossCompiling - when (not cross) $ needIservBins stg - root <- buildRoot - -- require the shims for testing stage1 -- need =<< sequence [(\f -> root -/- "stage1-test/bin" -/- takeFileName f) <$> (pkgFile Stage0 p) | (Stage0,p) <- exepkgs] -+ need =<< sequence [(\f -> root -/- "stage1-test/bin" -/- takeFileName f) <$> (pkgFile stage0InTree p) | (Stage0 InTreeLibs,p) <- exepkgs] - - -- stage 1 ghc lives under stage0/bin, - -- stage 2 ghc lives under stage1/bin, etc - stageOf :: String -> Maybe Stage --stageOf "stage1" = Just Stage0 -+stageOf "stage1" = Just stage0InTree - stageOf "stage2" = Just Stage1 - stageOf "stage3" = Just Stage2 - stageOf _ = Nothing -@@ -305,7 +305,7 @@ needIservBins stg = do - -- Only build iserv binaries if all dependencies are built the right - -- way already. In particular this fixes the case of no_profiled_libs - -- not working with the testsuite, see #19624 -- canBuild Stage0 _ = pure Nothing -+ canBuild (Stage0 {}) _ = pure Nothing - canBuild stg w = do - contextDeps <- contextDependencies (Context stg iserv w) - ws <- forM contextDeps $ \c -> -diff --git a/hadrian/src/Rules/ToolArgs.hs b/hadrian/src/Rules/ToolArgs.hs -index eff690cd9bb..105ed8f15a8 100644 ---- a/hadrian/src/Rules/ToolArgs.hs -+++ b/hadrian/src/Rules/ToolArgs.hs -@@ -49,8 +49,8 @@ mkToolTarget es p = do - -- This builds automatically generated dependencies. Not sure how to do - -- this generically yet. - allDeps -- let fake_target = target (Context Stage0 p (if windowsHost then vanilla else dynamic)) -- (Ghc ToolArgs Stage0) [] ["ignored"] -+ let fake_target = target (Context stage0InTree p (if windowsHost then vanilla else dynamic)) -+ (Ghc ToolArgs stage0InTree) [] ["ignored"] - arg_list <- interpret fake_target getArgs - liftIO $ putStrLn (intercalate "\n" (arg_list ++ es)) - allDeps :: Action () -@@ -59,14 +59,14 @@ allDeps = do - -- We can't build DLLs on Windows (yet). Actually we should only - -- include the dynamic way when we have a dynamic host GHC, but just - -- checking for Windows seems simpler for now. -- let fake_target = target (Context Stage0 compiler (if windowsHost then vanilla else dynamic)) -- (Ghc ToolArgs Stage0) [] ["ignored"] -+ let fake_target = target (Context stage0InTree compiler (if windowsHost then vanilla else dynamic)) -+ (Ghc ToolArgs stage0InTree) [] ["ignored"] - - -- need the autogenerated files so that they are precompiled - interpret fake_target Rules.Generate.compilerDependencies >>= need - - root <- buildRoot -- let dir = buildDir (vanillaContext Stage0 compiler) -+ let dir = buildDir (vanillaContext stage0InTree compiler) - need [ root -/- dir -/- "GHC" -/- "Settings" -/- "Config.hs" ] - need [ root -/- dir -/- "GHC" -/- "Parser.hs" ] - need [ root -/- dir -/- "GHC" -/- "Parser" -/- "Lexer.hs" ] -@@ -114,12 +114,12 @@ dirMap = do - -- configuring would build the whole GHC library which we probably - -- don't want to do. - mkGhc = do -- let c = (Context Stage0 compiler (if windowsHost then vanilla else dynamic)) -+ let c = (Context stage0InTree compiler (if windowsHost then vanilla else dynamic)) - cd <- readContextData c - fp <- liftIO $ canonicalizePath "ghc/" - return (fp, (compiler, "-ighc" : modules cd ++ otherModules cd ++ ["ghc/Main.hs"])) - go p = do -- let c = (Context Stage0 p (if windowsHost then vanilla else dynamic)) -+ let c = (Context stage0InTree p (if windowsHost then vanilla else dynamic)) - -- readContextData has the effect of configuring the package so all - -- dependent packages will also be built. - cd <- readContextData c -diff --git a/hadrian/src/Settings/Builders/Cabal.hs b/hadrian/src/Settings/Builders/Cabal.hs -index 82e34d85949..4486ab002b1 100644 ---- a/hadrian/src/Settings/Builders/Cabal.hs -+++ b/hadrian/src/Settings/Builders/Cabal.hs -@@ -39,7 +39,7 @@ cabalInstallArgs = builder (Cabal Install) ? do - -- of the stage 2 compiler - assertNoBuildRootLeak :: Args -> Args - assertNoBuildRootLeak args = do -- libPaths <- expr $ mapM stageLibPath [Stage0 ..] -+ libPaths <- expr $ mapM stageLibPath allStages - xs <- args - pure $ assert (not $ any (\arg -> or [libPath `isInfixOf` arg && not ("package.conf.d" `isSuffixOf` arg) - | libPath <- libPaths]) xs) -@@ -205,8 +205,8 @@ configureArgs cFlags' ldFlags' = do - ] - - bootPackageConstraints :: Args --bootPackageConstraints = stage0 ? do -- bootPkgs <- expr $ stagePackages Stage0 -+bootPackageConstraints = (stage0InTree ==) <$> getStage ? do -+ bootPkgs <- expr $ stagePackages stage0InTree - let pkgs = filter (\p -> p /= compiler && isLibrary p) bootPkgs - constraints <- expr $ forM (sort pkgs) $ \pkg -> do - version <- pkgVersion pkg -diff --git a/hadrian/src/Settings/Builders/Ghc.hs b/hadrian/src/Settings/Builders/Ghc.hs -index 3804c7ecc9e..7deb22f1793 100644 ---- a/hadrian/src/Settings/Builders/Ghc.hs -+++ b/hadrian/src/Settings/Builders/Ghc.hs -@@ -24,7 +24,7 @@ ghcBuilderArgs = mconcat - -- config at build time. - -- See Note [Genapply target as host for RTS macros]. - stage <- getStage -- nextStageRtsBuildDir <- expr $ rtsBuildPath $ succ stage -+ nextStageRtsBuildDir <- expr $ rtsBuildPath $ succStage stage - let nextStageRtsBuildIncludeDir = nextStageRtsBuildDir </> "include" - builder Ghc ? arg ("-I" ++ nextStageRtsBuildIncludeDir) - , compileAndLinkHs, compileC, compileCxx, findHsDependencies -diff --git a/hadrian/src/Settings/Builders/GhcPkg.hs b/hadrian/src/Settings/Builders/GhcPkg.hs -index 752f1718dab..5de76cc7534 100644 ---- a/hadrian/src/Settings/Builders/GhcPkg.hs -+++ b/hadrian/src/Settings/Builders/GhcPkg.hs -@@ -35,7 +35,7 @@ ghcPkgBuilderArgs = mconcat - config <- expr $ pkgInplaceConfig context - stage <- getStage - pkgDb <- expr $ packageDbPath stage -- mconcat [ notStage0 ? use_db pkgDb -+ mconcat [ notM stage0 ? use_db pkgDb - , arg "update" - , arg "--force" - , verbosity < Verbose ? arg "-v0" -diff --git a/hadrian/src/Settings/Builders/Hsc2Hs.hs b/hadrian/src/Settings/Builders/Hsc2Hs.hs -index f1a44b5e87a..7492f6e29ac 100644 ---- a/hadrian/src/Settings/Builders/Hsc2Hs.hs -+++ b/hadrian/src/Settings/Builders/Hsc2Hs.hs -@@ -16,10 +16,10 @@ hsc2hsBuilderArgs = builder Hsc2Hs ? do - hOs <- getSetting HostOs - tArch <- getSetting TargetArch - tOs <- getSetting TargetOs -- version <- if stage == Stage0 -- then expr ghcCanonVersion -- else getSetting ProjectVersionInt -- tmpl <- (top -/-) <$> expr (templateHscPath Stage0) -+ version <- case stage of -+ Stage0 {} -> expr ghcCanonVersion -+ _ -> getSetting ProjectVersionInt -+ tmpl <- (top -/-) <$> expr (templateHscPath stage0Boot) - mconcat [ arg $ "--cc=" ++ ccPath - , arg $ "--ld=" ++ ccPath - , notM isWinTarget ? notM (flag CrossCompiling) ? arg "--cross-safe" -diff --git a/hadrian/src/Settings/Builders/Make.hs b/hadrian/src/Settings/Builders/Make.hs -index f00aab97768..22096a08384 100644 ---- a/hadrian/src/Settings/Builders/Make.hs -+++ b/hadrian/src/Settings/Builders/Make.hs -@@ -12,7 +12,7 @@ makeBuilderArgs = do - threads <- shakeThreads <$> expr getShakeOptions - stage <- getStage - gmpPath <- expr (gmpBuildPath stage) -- libffiPaths <- forM [Stage1 ..] $ \s -> expr (libffiBuildPath s) -+ libffiPaths <- forM [Stage1, Stage2, Stage3 ] $ \s -> expr (libffiBuildPath s) - let t = show $ max 4 (threads - 2) -- Don't use all Shake's threads - mconcat $ - (builder (Make gmpPath ) ? pure ["MAKEFLAGS=-j" ++ t]) : -diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs -index 0e442cb9be5..f6b40d40653 100644 ---- a/hadrian/src/Settings/Builders/RunTest.hs -+++ b/hadrian/src/Settings/Builders/RunTest.hs -@@ -264,7 +264,7 @@ runTestBuilderArgs = builder Testsuite ? do - , arg "-e", arg $ "config.os=" ++ show os - , arg "-e", arg $ "config.arch=" ++ show arch - , arg "-e", arg $ "config.platform=" ++ show platform -- , arg "-e", arg $ "config.stage=" ++ show (fromEnum (C.stage ctx) + 1) -+ , arg "-e", arg $ "config.stage=" ++ show (stageNumber (C.stage ctx)) - - , arg "--config", arg $ "gs=gs" -- Use the default value as in test.mk - , arg "--config", arg $ "timeout_prog=" ++ show (top -/- timeoutProg) -@@ -281,6 +281,12 @@ runTestBuilderArgs = builder Testsuite ? do - where emitWhenSet Nothing _ = mempty - emitWhenSet (Just v) f = f v - -+ stageNumber (Stage0 GlobalLibs) = error "stageNumber stageBoot" -+ stageNumber (Stage0 InTreeLibs) = 1 -+ stageNumber Stage1 = 2 -+ stageNumber Stage2 = 3 -+ stageNumber Stage3 = 4 -+ - -- | Command line arguments for running GHC's test script. - getTestArgs :: Args - getTestArgs = do -diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs -index 54562b8aa3e..ae9ea2ce81b 100644 ---- a/hadrian/src/Settings/Default.hs -+++ b/hadrian/src/Settings/Default.hs -@@ -50,7 +50,8 @@ import Settings.Builders.Win32Tarballs - - -- | Packages that are built by default. You can change this in "UserSettings". - defaultPackages :: Stage -> Action [Package] --defaultPackages Stage0 = stage0Packages -+defaultPackages (Stage0 GlobalLibs) = stageBootPackages -+defaultPackages (Stage0 InTreeLibs) = stage0Packages - defaultPackages Stage1 = stage1Packages - defaultPackages Stage2 = stage2Packages - defaultPackages Stage3 = return [] -@@ -59,20 +60,26 @@ defaultPackages Stage3 = return [] - defaultBignumBackend :: String - defaultBignumBackend = "gmp" - -+-- These packages are things needed to do the build.. so they are only built by -+-- boot compiler, with global package database. By default we will only build these -+-- packages in StageBoot so if you also need to distribute anything here then add -+-- it to `stage0packages` or `stage1packages` as appropiate. -+stageBootPackages :: Action [Package] -+stageBootPackages = return [lintersCommon, lintCommitMsg, lintSubmoduleRefs, lintWhitespace, lintNotes, hsc2hs, compareSizes, deriveConstants, genapply, genprimopcode, unlit ] -+ - -- | Packages built in 'Stage0' by default. You can change this in "UserSettings". - stage0Packages :: Action [Package] - stage0Packages = do - cross <- flag CrossCompiling -+ winTarget <- isWinTarget - return $ [ binary - , bytestring - , cabalSyntax - , cabal -- , compareSizes - , compiler -- , deriveConstants -+ , directory -+ , process - , exceptions -- , genapply -- , genprimopcode - , ghc - , runGhc - , ghcBoot -@@ -85,15 +93,12 @@ stage0Packages = do - , hpcBin - , mtl - , parsec -+ , time - , templateHaskell - , text - , transformers - , unlit -- , lintersCommon -- , lintNotes -- , lintCommitMsg -- , lintSubmoduleRefs -- , lintWhitespace -+ , if winTarget then win32 else unix - ] - ++ [ terminfo | not windowsHost, not cross ] - ++ [ timeout | windowsHost ] -@@ -113,10 +118,8 @@ stage1Packages = do - [ libraries0 -- Build all Stage0 libraries in Stage1 - , [ array - , base -- , bytestring - , containers - , deepseq -- , directory - , exceptions - , filepath - , ghc -@@ -129,10 +132,8 @@ stage1Packages = do - , hsc2hs - , integerGmp - , pretty -- , process - , rts - , stm -- , time - , unlit - , xhtml - ] -@@ -143,7 +144,6 @@ stage1Packages = do - , libiserv - , runGhc - ] -- , if winTarget then [ win32 ] else [ unix ] - , when (winTarget && not cross) - [ touchy - -- See Note [Hadrian's ghci-wrapper package] -diff --git a/hadrian/src/Settings/Flavours/Development.hs b/hadrian/src/Settings/Flavours/Development.hs -index 75c0886bce9..00831012cc1 100644 ---- a/hadrian/src/Settings/Flavours/Development.hs -+++ b/hadrian/src/Settings/Flavours/Development.hs -@@ -10,12 +10,17 @@ import {-# SOURCE #-} Settings.Default - -- Please update doc/flavours.md when changing this file. - developmentFlavour :: Stage -> Flavour - developmentFlavour ghcStage = defaultFlavour -- { name = "devel" ++ show (fromEnum ghcStage) -+ { name = "devel" ++ stageString ghcStage - , args = defaultBuilderArgs <> developmentArgs ghcStage <> defaultPackageArgs - , libraryWays = pure [vanilla] - , rtsWays = pure [vanilla, logging, debug, threaded, threadedLogging, threadedDebug] - , dynamicGhcPrograms = return False - , ghcDebugAssertions = True } -+ where -+ stageString Stage2 = "2" -+ stageString Stage1 = "1" -+ stageString Stage3 = "3" -+ stageString s = error ("developmentFlavour not support for " ++ show s) - - developmentArgs :: Stage -> Args - developmentArgs ghcStage = do -@@ -27,5 +32,5 @@ developmentArgs ghcStage = do - package cabal ? pure ["-O0"]] - , hsLibrary = notStage0 ? arg "-dcore-lint" - , hsCompiler = mconcat [stage0 ? arg "-O2", -- succ stage == ghcStage ? pure ["-O0"]] -- , hsGhc = succ stage == ghcStage ? pure ["-O0"] } -+ stage == predStage ghcStage ? pure ["-O0"]] -+ , hsGhc = stage == predStage ghcStage ? pure ["-O0"] } -diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs -index 85fd0812f65..7473a1fb5fa 100644 ---- a/hadrian/src/Settings/Packages.hs -+++ b/hadrian/src/Settings/Packages.hs -@@ -22,7 +22,7 @@ packageArgs = do - - -- Check if the bootstrap compiler has the same version as the one we - -- are building. This is used to build cross-compilers -- bootCross = (==) <$> ghcVersionStage Stage0 <*> ghcVersionStage Stage1 -+ bootCross = (==) <$> ghcVersionStage (stage0InTree) <*> ghcVersionStage Stage1 - - cursesIncludeDir <- getSetting CursesIncludeDir - cursesLibraryDir <- getSetting CursesLibDir -diff --git a/hadrian/src/Settings/Program.hs b/hadrian/src/Settings/Program.hs -index d45b2650080..62d41909d38 100644 ---- a/hadrian/src/Settings/Program.hs -+++ b/hadrian/src/Settings/Program.hs -@@ -19,6 +19,9 @@ programContext stage pkg = do - where wayFor prof dyn - | prof && dyn = - error "programContext: profiling+dynamic not supported" -- | pkg == ghc && prof && stage > Stage0 = profiling -- | dyn && stage > Stage0 = dynamic -+ | pkg == ghc && prof && notStage0 stage = profiling -+ | dyn && notStage0 stage = dynamic - | otherwise = vanilla -+ -+ notStage0 (Stage0 {}) = False -+ notStage0 _ = True -diff --git a/hadrian/src/Stage.hs b/hadrian/src/Stage.hs -index 8f243ff8d7b..be2d123e06d 100644 ---- a/hadrian/src/Stage.hs -+++ b/hadrian/src/Stage.hs -@@ -1,14 +1,19 @@ - {-# LANGUAGE LambdaCase #-} --module Stage (Stage (..), stageString) where -+module Stage (Stage (..), WhichLibs(..), isStage0, stage0InTree, stage0Boot, allStages,predStage, succStage, stageString) where - - import Development.Shake.Classes - import GHC.Generics - - -- | A stage refers to a certain compiler in GHC's build process. - -- ---- * Stage 0 is built with the bootstrapping compiler, i.e. the one already -+-- * Stage0 GlobalLibs is for **executables** which are built with the boot compiler -+-- and boot compiler packages. For example, this was motivated by needing to -+-- build hsc2hs, a build dependency of unix with just the boot toolchain. (See #21634) -+-- -+-- * Stage 0 (InTreeLibs) is built with the bootstrapping compiler, i.e. the one already - -- installed on the user's system. The compiler that is produced during ---- stage 0 is called /stage 1 compiler/. -+-- stage 0 is called /stage 1 compiler/. Stage0 executables and libraries are -+-- build against the other libraries (in-tree) built by the stage 0 compiler. - -- - -- * Stage 1 is built using the stage 1 compiler and all GHC sources. The result - -- is called /stage 2 compiler/ and it has all features of the new GHC. -@@ -20,17 +25,81 @@ import GHC.Generics - -- the same object code as the one built in stage 2, which is a good test - -- for the compiler. Since it serves no other purpose than that, the stage 3 - -- build is usually omitted in the build process. --data Stage = Stage0 | Stage1 | Stage2 | Stage3 -- deriving (Show, Eq, Ord, Enum, Generic, Bounded) -+data Stage = Stage0 WhichLibs | Stage1 | Stage2 | Stage3 -+ deriving (Show, Eq, Ord, Generic) -+ -+ -+-- | See Note [Stage 0 build plans] -+data WhichLibs = GlobalLibs -- ^ Build build tools against the globally installed libraries -+ | InTreeLibs -- ^ Build the compiler against the in-tree libraries. -+ deriving (Show, Eq, Ord, Generic) -+ -+allStages :: [Stage] -+allStages = [Stage0 GlobalLibs, Stage0 InTreeLibs, Stage1, Stage2, Stage3] -+ -+stage0InTree, stage0Boot :: Stage -+stage0InTree = Stage0 InTreeLibs -+stage0Boot = Stage0 GlobalLibs -+ -+isStage0 :: Stage -> Bool -+isStage0 Stage0 {} = True -+isStage0 _ = False -+ -+ -+predStage :: Stage -> Stage -+predStage Stage1 = stage0InTree -+predStage Stage2 = Stage1 -+predStage Stage3 = Stage2 -+predStage s = error ("predStage: " ++ show s) -+ -+succStage :: Stage -> Stage -+succStage (Stage0 {}) = Stage1 -+succStage Stage1 = Stage2 -+succStage Stage2 = Stage3 -+succStage Stage3 = error "succStage: Stage3" - - instance Binary Stage - instance Hashable Stage - instance NFData Stage - -+instance Binary WhichLibs -+instance Hashable WhichLibs -+instance NFData WhichLibs -+ - -- | Prettyprint a 'Stage'. - stageString :: Stage -> String - stageString = \case -- Stage0 -> "stage0" -+ Stage0 GlobalLibs -> "stageBoot" -+ Stage0 InTreeLibs -> "stage0" - Stage1 -> "stage1" - Stage2 -> "stage2" - Stage3 -> "stage3" -+ -+{- -+Note [Stage 0 build plans] -+~~~~~~~~~~~~~~~~~~~~~~~~~~ -+ -+The Stage refers to which compiler we will use to perform the builds. -+ -+ Stage0: Build with the boot toolchain -+ Stage1: Build with compiler built in stage 0 -+ Stage2: Build with compiler built in stage 1 -+ -+Stage 0 also has two different package databases. -+ -+ Stage0 GlobalLibs: Used for building build tool dependencies (hsc2hs, unlit, linters etc) -+ Mostly using the libraries from the boot compiler. -+ Stage0 InTreeLibs: Used for building the Stage 1 compiler (ghc executable) and all libraries -+ needed by that. -+ -+The reason for this split is -+ -+1. bytestring depends on template-haskell so we need to build bytestring with stage0 (and all -+ packages which depend on it). This includes unix and hence directory (which depends on unix) but -+ unix depends on hsc2hs (which depends on directory) and you get a loop in the build -+ rules if you try to build them all in the same package database. -+ The solution is to build hsc2hs with the global boot libraries in Stage0 GlobalLibs -+2. We want to build linters and other build tools which we don't distribute in a separate -+ package database so they don't end up in the bindist package database. -+ -+-} --- -GitLab diff --git a/9aace0eaf6279f17368a1753b65afbdc466e8291.patch b/9aace0eaf6279f17368a1753b65afbdc466e8291.patch deleted file mode 100644 index 101281b..0000000 --- a/9aace0eaf6279f17368a1753b65afbdc466e8291.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 9aace0eaf6279f17368a1753b65afbdc466e8291 Mon Sep 17 00:00:00 2001 -From: Sylvain Henry sylvain@haskus.fr -Date: Sat, 10 Apr 2021 14:48:16 +0200 -Subject: [PATCH] Produce constant file atomically (#19684) - ---- - utils/deriveConstants/Main.hs | 21 ++++++++++++++++----- - utils/deriveConstants/deriveConstants.cabal | 3 ++- - 2 files changed, 18 insertions(+), 6 deletions(-) - -diff --git a/utils/deriveConstants/Main.hs b/utils/deriveConstants/Main.hs -index 8bf8ae7b44d7..9db673a98529 100644 ---- a/utils/deriveConstants/Main.hs -+++ b/utils/deriveConstants/Main.hs -@@ -34,9 +34,10 @@ import Data.Maybe (catMaybes, mapMaybe, fromMaybe) - import Numeric (readHex) - import System.Environment (getArgs) - import System.Exit (ExitCode(ExitSuccess), exitFailure) --import System.FilePath ((</>)) -+import System.FilePath ((</>),(<.>)) - import System.IO (stderr, hPutStrLn) - import System.Process (showCommandForUser, readProcess, rawSystem) -+import System.Directory (renameFile) - - main :: IO () - main = do opts <- parseArgs -@@ -79,6 +80,16 @@ data Options = Options { - o_targetOS :: Maybe String - } - -+-- | Write a file atomically -+-- -+-- This avoids other processes seeing the file while it is being written into. -+atomicWriteFile :: FilePath -> String -> IO () -+atomicWriteFile fn s = do -+ let tmp = fn <.> "tmp" -+ writeFile tmp s -+ renameFile tmp fn -+ -+ - parseArgs :: IO Options - parseArgs = do args <- getArgs - opts <- f emptyOptions args -@@ -670,7 +681,7 @@ getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram - = do let cStuff = unlines (headers ++ concatMap (doWanted . snd) (wanteds os)) - cFile = tmpdir </> "tmp.c" - oFile = tmpdir </> "tmp.o" -- writeFile cFile cStuff -+ atomicWriteFile cFile cStuff - execute verbose gccProgram (gccFlags ++ ["-c", cFile, "-o", oFile]) - xs <- case os of - "openbsd" -> readProcess objdumpProgam ["--syms", oFile] "" -@@ -855,7 +866,7 @@ getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram - = return (w, FieldTypeGcptrMacro name) - - writeHaskellType :: FilePath -> [What Fst] -> IO () --writeHaskellType fn ws = writeFile fn xs -+writeHaskellType fn ws = atomicWriteFile fn xs - where xs = unlines [header, body, footer, parser] - header = "module GHC.Platform.Constants where\n\n\ - \import Prelude\n\ -@@ -920,7 +931,7 @@ writeHaskellType fn ws = writeFile fn xs - - - writeHaskellValue :: FilePath -> [What Snd] -> IO () --writeHaskellValue fn rs = writeFile fn xs -+writeHaskellValue fn rs = atomicWriteFile fn xs - where xs = unlines [header, body, footer] - header = "PlatformConstants {" - footer = " }" -@@ -937,7 +948,7 @@ writeHaskellValue fn rs = writeFile fn xs - doWhat (FieldTypeGcptrMacro {}) = [] - - writeHeader :: FilePath -> [(Where, What Snd)] -> IO () --writeHeader fn rs = writeFile fn xs -+writeHeader fn rs = atomicWriteFile fn xs - where xs = headers ++ hs ++ unlines body - headers = "/* This file is created automatically. Do not edit by hand.*/\n\n" - haskellRs = fmap snd $ filter (\r -> fst r `elem` [Haskell,Both]) rs -diff --git a/utils/deriveConstants/deriveConstants.cabal b/utils/deriveConstants/deriveConstants.cabal -index 50b5b695c305..36ba7ebe1f7a 100644 ---- a/utils/deriveConstants/deriveConstants.cabal -+++ b/utils/deriveConstants/deriveConstants.cabal -@@ -20,4 +20,5 @@ Executable deriveConstants - Build-Depends: base >= 4 && < 5, - containers, - process, -- filepath -+ filepath, -+ directory --- -GitLab - diff --git a/ghc9.4.spec b/ghc9.4.spec index a485720..ec55187 100644 --- a/ghc9.4.spec +++ b/ghc9.4.spec @@ -16,7 +16,7 @@ %global ghcboot ghc9.0
# to handle RCs -%global ghc_release 9.4.1-alpha2 +%global ghc_release 9.4.1-alpha3
%global base_ver 4.17.0.0 %global ghc_compact_ver 0.1.0.0 @@ -65,12 +65,12 @@ %endif
Name: %{ghc_name} -Version: 9.4.0.20220523 +Version: 9.4.0.20220623 # Since library subpackages are versioned: # - release can only be reset if *all* library versions get bumped simultaneously # (sometimes after a major release) # - minor release numbers for a branch should be incremented monotonically -Release: 4%{?dist} +Release: 5%{?dist} Summary: Glasgow Haskell Compiler
License: BSD and HaskellReport @@ -92,19 +92,9 @@ Patch2: ghc-Cabal-install-PATH-warning.patch Patch3: ghc-gen_contents_index-nodocs.patch # https://phabricator.haskell.org/rGHC4eebc8016f68719e1ccdf460754a97d1f4d6ef05 Patch6: ghc-8.6.3-sphinx-1.8.patch -## DerivedConstants.h https://gitlab.haskell.org/ghc/ghc/-/issues/19684 -#Patch10: https://gitlab.haskell.org/ghc/ghc/-/commit/9aace0eaf6279f17368a1753b65afbdc... -# fix bindist install_docs error when no docs -# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8170 -Patch7: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8170.patch # detect ffi.h # https://gitlab.haskell.org/ghc/ghc/-/issues/21485 Patch8: https://gitlab.haskell.org/ghc/ghc/-/commit/6e12e3c178fe9ad16131eb3c089bd657... -# needs ghc9.0+ -Patch11: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8332.patch -# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8339 -# https://gitlab.haskell.org/ghc/ghc/-/issues/21634 (nor 9.2.3) -Patch14: 8339.patch
# arm patches Patch12: ghc-armv7-VFPv3D16--NEON.patch @@ -320,14 +310,14 @@ This provides the hadrian tool which can be used to build ghc.
# use "./libraries-versions.sh" to check versions %if %{defined ghclibdir} -%ghc_lib_subpackage -d -l BSD Cabal-3.7.0.0 -%ghc_lib_subpackage -d -l BSD Cabal-syntax-3.7.0.0 +%ghc_lib_subpackage -d -l BSD Cabal-3.8.0.20220526 +%ghc_lib_subpackage -d -l BSD Cabal-syntax-3.8.0.20220526 %ghc_lib_subpackage -d -l %BSDHaskellReport array-0.5.4.0 %ghc_lib_subpackage -d -l %BSDHaskellReport -c gmp-devel%{?_isa},libffi-devel%{?_isa} base-%{base_ver} %ghc_lib_subpackage -d -l BSD binary-0.8.9.0 %ghc_lib_subpackage -d -l BSD bytestring-0.11.3.0 %ghc_lib_subpackage -d -l %BSDHaskellReport containers-0.6.5.1 -%ghc_lib_subpackage -d -l %BSDHaskellReport deepseq-1.4.7.0 +%ghc_lib_subpackage -d -l %BSDHaskellReport deepseq-1.4.8.0 %ghc_lib_subpackage -d -l %BSDHaskellReport directory-1.3.7.1 %ghc_lib_subpackage -d -l %BSDHaskellReport exceptions-0.10.5 %ghc_lib_subpackage -d -l BSD filepath-1.4.2.2 @@ -395,10 +385,7 @@ Installing this package causes %{name}-*-prof packages corresponding to
%patch2 -p1 -b .orig %patch6 -p1 -b .orig -%patch7 -p1 -b .orig %patch8 -p1 -b .orig -%patch11 -p1 -b .orig -%patch14 -p1 -b .orig14
rm libffi-tarballs/libffi-*.tar.gz
@@ -462,8 +449,8 @@ EOF %endif
%build +# patch8 and patch12 autoupdate -./boot # --hadrian
%ghc_set_gcc_flags export CC=%{_bindir}/gcc @@ -613,7 +600,15 @@ sed -i -e 's!^library-dirs: %{ghclibdir}/rts!&\ndynamic-library-dirs: %{_libdir} ls -d %{buildroot}%{ghclibdir}/package.conf.d/rts.conf >> %{name}-base-devel.files %endif
+%if %{with hadrian} +ls -d %{buildroot}%{ghclibdir}/lib/package.conf.d/system-cxx-std-lib-1.0.conf >> %{name}-base-devel.files +# https://gitlab.haskell.org/ghc/ghc/-/commit/0ef249aa26f653677c5368bb51af34f7... +ls -d %{buildroot}%{ghclibdir}/lib/system-cxx-std-lib-1.0.conf >> %{name}-base-devel.files +%endif + +%if %{without hadrian} ls -d %{buildroot}%{ghclibdir}/include >> %{name}-base-devel.files +%endif
%if %{with ghc_prof} ls %{buildroot}%{ghclibdir}/bin/ghc-iserv-prof* >> %{name}-base-prof.files @@ -779,9 +774,6 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %{_bindir}/ghc-%{ghc_major} %{_bindir}/ghc-pkg-%{ghc_major} %{_bindir}/ghci-%{ghc_major} -%{_bindir}/hp2ps-%{?with_hadrian:ghc-}%{ghc_major} -%{_bindir}/hpc-%{?with_hadrian:ghc-}%{ghc_major} -%{_bindir}/hsc2hs-%{?with_hadrian:ghc-}%{ghc_major} %{_bindir}/runghc-%{ghc_major} %{_bindir}/runhaskell-%{ghc_major} %dir %{ghclibdir}/bin @@ -905,6 +897,11 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%changelog +* Sat Jun 25 2022 Jens Petersen petersen@redhat.com - 9.4.0.20220623-5 +- 9.4.1-alpha3 +- https://downloads.haskell.org/ghc/9.4.1-alpha3/docs/users_guide/9.4.1-notes.... +- add major version symlinks for programs in /usr/bin + * Thu Jun 9 2022 Jens Petersen petersen@redhat.com - 9.4.0.20220523-4 - add filesystem subpackage - backport upstream hadrian patch to allow boot with ghc9.0 diff --git a/sources b/sources index 31c3e42..4a53dca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ghc-9.4.0.20220523-src.tar.lz) = 4c8ef7b5a31573d61862574caa5f1d084c2ce6c094746f0832d7176f7d94d0dc4a4b03b8eec2de198164149062ab652d2e8799f67be29241632f170e6f7b5375 +SHA512 (ghc-9.4.0.20220623-src.tar.lz) = e6c70934b158294ba6ecd6b117e08def087d6ae68bfba4362f3fb56279e45264d1dde70dc41c9289b458ae0cb06f0c7eae36849a0e1b923495b0b31630f0f677
commit 5ac699d845c536ef43887eafb2bc0ff4a0342d64 Author: Jens Petersen petersen@redhat.com Date: Sat Jun 25 23:34:51 2022 +0800
add major version bin symlinks like ghc-9.4
diff --git a/ghc9.4.spec b/ghc9.4.spec index 5303e30..a485720 100644 --- a/ghc9.4.spec +++ b/ghc9.4.spec @@ -8,7 +8,8 @@ # use the Hadrian buildsystem %bcond_without hadrian
-%global ghc_name ghc9.4 +%global ghc_major 9.4 +%global ghc_name ghc%{ghc_major}
# bootstrap from this package # NB must be in sync with GHC configure variable below @@ -673,6 +674,13 @@ done ) %endif
+(cd %{buildroot}%{_bindir} +for i in *; do +if [ -f $i-%{version} ]; then +ln -s $i-%{version} $i-%{ghc_major} +fi +done +)
%check export LANG=C.utf8 @@ -768,6 +776,14 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %{_bindir}/hsc2hs-%{?with_hadrian:ghc-}%{version} %{_bindir}/runghc-%{version} %{_bindir}/runhaskell-%{version} +%{_bindir}/ghc-%{ghc_major} +%{_bindir}/ghc-pkg-%{ghc_major} +%{_bindir}/ghci-%{ghc_major} +%{_bindir}/hp2ps-%{?with_hadrian:ghc-}%{ghc_major} +%{_bindir}/hpc-%{?with_hadrian:ghc-}%{ghc_major} +%{_bindir}/hsc2hs-%{?with_hadrian:ghc-}%{ghc_major} +%{_bindir}/runghc-%{ghc_major} +%{_bindir}/runhaskell-%{ghc_major} %dir %{ghclibdir}/bin %{ghclibdir}/bin/ghc %{ghclibdir}/bin/ghc-iserv
commit 828a4ed034eccd42178411d38569a00f9d4f925f Author: Jens Petersen petersen@redhat.com Date: Sat Jun 25 23:33:03 2022 +0800
move down %files hadrian
diff --git a/ghc9.4.spec b/ghc9.4.spec index dbdefb5..5303e30 100644 --- a/ghc9.4.spec +++ b/ghc9.4.spec @@ -847,12 +847,6 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%files devel
-%if %{with hadrian} -%files hadrian -%license LICENSE.hadrian -%{_bindir}/hadrian-%{version} -%endif - %if %{with haddock} %files doc %if %{with hadrian} @@ -870,6 +864,12 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %dir %ghc_html_libraries_dir %endif
+%if %{with hadrian} +%files hadrian +%license LICENSE.hadrian +%{_bindir}/hadrian-%{version} +%endif + %if %{with manual} %files manual ## needs pandoc
commit 2a05a78b70520386ccf49834ee7d3492d90a1516 Author: Jens Petersen petersen@redhat.com Date: Fri Jun 10 21:10:42 2022 +0800
update CI test for 9.4
diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh index df42ac3..ca5edcb 100755 --- a/tests/smoke/runtest.sh +++ b/tests/smoke/runtest.sh @@ -1,6 +1,9 @@ #!/bin/sh
+set -e + echo 'main = return ()' > test.hs -ghc-9.2.1 test.hs && ./test + +/usr/bin/ghc-9.4.* test.hs && ./test
ghc test.hs && ./test diff --git a/tests/tests.yml b/tests/tests.yml index 1851c15..1fedccf 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -5,7 +5,7 @@ roles: - role: standard-test-basic required_packages: - - ghc9.2 + - ghc9.4 - ghc tests: - smoke
commit 94838c5ed551319ddfd28401ace554f9b4bc500a Author: Jens Petersen petersen@redhat.com Date: Thu Jun 9 13:41:04 2022 +0800
filesystem subpackage fixups
compiler should now require ghc9.4-filesystem
diff --git a/ghc9.4.spec b/ghc9.4.spec index 25c5ae4..dbdefb5 100644 --- a/ghc9.4.spec +++ b/ghc9.4.spec @@ -2,7 +2,7 @@ # NB This must be disabled (bcond_with) for all koji production builds %bcond_with quickbuild
-# make sure ghc libraries' ABI hashes unchanged +# make sure ghc libraries' ABI hashes unchanged (ghcX.Y not supported yet) %bcond_with abicheck
# use the Hadrian buildsystem @@ -229,9 +229,11 @@ Summary: GHC compiler and utilities License: BSD Requires: gcc%{?_isa} Requires: %{name}-base-devel%{?_isa} = %{base_ver}-%{release} -Requires: ghc-filesystem = %{version}-%{release} -%if %{without haddock} +%if %{with haddock} +Requires: %{name}-filesystem = %{version}-%{release} +%else Obsoletes: %{name}-doc-index < %{version}-%{release} +Obsoletes: %{name}-filesystem < %{version}-%{release} %endif %ifarch %{ghc_llvm_archs} %if 0%{?fedora} >= 34 @@ -258,15 +260,6 @@ Conflicts: ghc-compiler The package contains symlinks to make %{name} the default GHC compiler.
-%package filesystem -Summary: Shared directories for Haskell documentation -BuildArch: noarch - -%description filesystem -This package provides some common directories used for -Haskell libraries documentation. - - %if %{with haddock} %package doc Summary: Haskell library documentation meta package @@ -285,6 +278,15 @@ BuildArch: noarch
%description doc-index The package enables re-indexing of installed library documention. + + +%package filesystem +Summary: Shared directories for Haskell documentation +BuildArch: noarch + +%description filesystem +This package provides some common directories used for +Haskell libraries documentation. %endif
@@ -293,6 +295,7 @@ The package enables re-indexing of installed library documention. Summary: GHC manual License: BSD BuildArch: noarch +Requires: %{name}-filesystem = %{version}-%{release}
%description manual This package provides the User Guide and Haddock manual. @@ -844,10 +847,11 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%files devel
-%files filesystem -%dir %_ghc_doc_dir -%dir %ghc_html_dir -%dir %ghc_html_libraries_dir +%if %{with hadrian} +%files hadrian +%license LICENSE.hadrian +%{_bindir}/hadrian-%{version} +%endif
%if %{with haddock} %files doc @@ -859,12 +863,11 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %{ghc_html_libraries_dir}/gen_contents_index %verify(not size mtime) %{ghc_html_libraries_dir}/doc-index*.html %verify(not size mtime) %{ghc_html_libraries_dir}/index*.html -%endif
-%if %{with hadrian} -%files hadrian -%license LICENSE.hadrian -%{_bindir}/hadrian-%{version} +%files filesystem +%dir %_ghc_doc_dir +%dir %ghc_html_dir +%dir %ghc_html_libraries_dir %endif
%if %{with manual}
commit 5143f0964e2ffb75da7d8c95ba7981aa15186d33 Author: Jens Petersen petersen@redhat.com Date: Thu Jun 9 09:32:30 2022 +0800
hadrian patch 8339 drops the linters-common file
diff --git a/ghc9.4.spec b/ghc9.4.spec index 76a3349..25c5ae4 100644 --- a/ghc9.4.spec +++ b/ghc9.4.spec @@ -820,7 +820,6 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %{ghclibdir}/bin/haddock %endif %{ghc_html_libraries_dir}/prologue.txt -%{ghc_html_libraries_dir}/linters-common %verify(not size mtime) %{ghc_html_libraries_dir}/haddock-bundle.min.js %verify(not size mtime) %{ghc_html_libraries_dir}/linuwial.css %verify(not size mtime) %{ghc_html_libraries_dir}/quick-jump.css
commit 1ce8c1bdb68b7648a4f0f4cdccd1c65297f0177c Author: Jens Petersen petersen@redhat.com Date: Thu Jun 9 02:22:06 2022 +0800
BR ghc-rpm-macros-extra >= 2.3.16
diff --git a/ghc9.4.spec b/ghc9.4.spec index db36fda..76a3349 100644 --- a/ghc9.4.spec +++ b/ghc9.4.spec @@ -131,7 +131,7 @@ BuildRequires: %{ghcboot}-compiler > 9.0 %if %{with abicheck} BuildRequires: %{name} %endif -BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-rpm-macros-extra >= 2.3.16 BuildRequires: %{ghcboot}-binary-devel BuildRequires: %{ghcboot}-bytestring-devel BuildRequires: %{ghcboot}-containers-devel
commit 9d9fcb2dd5821b383e60bf8175694ec70f33c83b Author: Jens Petersen petersen@redhat.com Date: Thu Jun 9 02:12:02 2022 +0800
2 comment tweaks
diff --git a/ghc9.4.spec b/ghc9.4.spec index 27442e6..db36fda 100644 --- a/ghc9.4.spec +++ b/ghc9.4.spec @@ -397,7 +397,6 @@ Installing this package causes %{name}-*-prof packages corresponding to %patch14 -p1 -b .orig14
rm libffi-tarballs/libffi-*.tar.gz -#sed -i -e '/libffi-tarballs/d' packages
%ifarch armv7hl %patch12 -p1 -b .orig diff --git a/libraries-versions.sh b/libraries-versions.sh index 136c0fd..3e16f78 100755 --- a/libraries-versions.sh +++ b/libraries-versions.sh @@ -7,4 +7,5 @@ fi
cd libraries
+# should handle ../rts/rts.cabal.in grep -i ^version: $(find * -name "*.cabal*" | sort) | grep -v -e "(Win32|cabal-|gmp.old|gmp2|integer-simple|tests|bench)" -e "@ProjectVersionMunged@" | grep -e '[0-9].' | sed -e "s!.*/([^/]*).cabal:[Vv]ersion: +!\1-!"
commit a7bd64cc93ae5d146ff8825d83b76116014ee15e Author: Jens Petersen petersen@redhat.com Date: Wed Jun 8 23:19:31 2022 +0800
backport upstream hadrian patch to allow boot with ghc9.0
diff --git a/8339.patch b/8339.patch new file mode 100644 index 0000000..0215ca6 --- /dev/null +++ b/8339.patch @@ -0,0 +1,1100 @@ +From 172b87018ef20d1347745b9702cf330a57884780 Mon Sep 17 00:00:00 2001 +From: Matthew Pickering matthewtpickering@gmail.com +Date: Wed, 25 May 2022 16:22:35 +0100 +Subject: [PATCH 1/2] hadrian: Introduce new package database for executables + needed to build stage0 + +These executables (such as hsc2hs) are built using the boot compiler and +crucially, most libraries from the global package database. + +We also move other build-time executables to be built in this stage such +as linters which also cleans up which libraries end up in the global +package database. This allows us to remove hacks where linters-common is +removed from the package database when a bindist is created. + +This fixes issues caused by infinite recursion due to bytestring adding +a dependency on template-haskell. + +Fixes #21634 +--- + .gitlab-ci.yml | 8 +- + hadrian/src/Builder.hs | 38 ++++----- + hadrian/src/Context.hs | 2 +- + hadrian/src/Expression.hs | 8 +- + hadrian/src/Flavour.hs | 4 +- + hadrian/src/Hadrian/BuildPath.hs | 8 +- + hadrian/src/Oracles/Setting.hs | 16 ++-- + hadrian/src/Oracles/TestSettings.hs | 2 +- + hadrian/src/Rules.hs | 12 +-- + hadrian/src/Rules/BinaryDist.hs | 11 --- + hadrian/src/Rules/Clean.hs | 2 +- + hadrian/src/Rules/Generate.hs | 23 ++++-- + hadrian/src/Rules/Libffi.hs | 2 +- + hadrian/src/Rules/Program.hs | 18 ++--- + hadrian/src/Rules/Register.hs | 5 +- + hadrian/src/Rules/Rts.hs | 2 +- + hadrian/src/Rules/Selftest.hs | 6 +- + hadrian/src/Rules/SimpleTargets.hs | 11 +-- + hadrian/src/Rules/SourceDist.hs | 16 ++-- + hadrian/src/Rules/Test.hs | 18 ++--- + hadrian/src/Rules/ToolArgs.hs | 14 ++-- + hadrian/src/Settings/Builders/Cabal.hs | 6 +- + hadrian/src/Settings/Builders/Ghc.hs | 2 +- + hadrian/src/Settings/Builders/GhcPkg.hs | 2 +- + hadrian/src/Settings/Builders/Hsc2Hs.hs | 8 +- + hadrian/src/Settings/Builders/Make.hs | 2 +- + hadrian/src/Settings/Builders/RunTest.hs | 8 +- + hadrian/src/Settings/Default.hs | 30 ++++---- + hadrian/src/Settings/Flavours/Development.hs | 11 ++- + hadrian/src/Settings/Packages.hs | 2 +- + hadrian/src/Settings/Program.hs | 7 +- + hadrian/src/Stage.hs | 81 ++++++++++++++++++-- + 32 files changed, 236 insertions(+), 149 deletions(-) + +diff --git a/hadrian/src/Builder.hs b/hadrian/src/Builder.hs +index 160eb44f7a3..ed392486e50 100644 +--- a/hadrian/src/Builder.hs ++++ b/hadrian/src/Builder.hs +@@ -199,18 +199,20 @@ instance NFData Builder + -- 'Stage' and GHC 'Package'). + builderProvenance :: Builder -> Maybe Context + builderProvenance = \case +- DeriveConstants -> context Stage0 deriveConstants +- GenApply -> context Stage0 genapply +- GenPrimopCode -> context Stage0 genprimopcode +- Ghc _ Stage0 -> Nothing +- Ghc _ stage -> context (pred stage) ghc +- GhcPkg _ Stage0 -> Nothing +- GhcPkg _ s -> context (pred s) ghcPkg ++ DeriveConstants -> context stage0Boot deriveConstants ++ GenApply -> context stage0Boot genapply ++ GenPrimopCode -> context stage0Boot genprimopcode ++ Ghc _ (Stage0 {})-> Nothing ++ Ghc _ stage -> context (predStage stage) ghc ++ GhcPkg _ (Stage0 {}) -> Nothing ++ GhcPkg _ s -> context (predStage s) ghcPkg + Haddock _ -> context Stage1 haddock ++ Hsc2Hs _ -> context stage0Boot hsc2hs ++ Unlit -> context stage0Boot unlit ++ ++ -- Never used + Hpc -> context Stage1 hpcBin +- Hp2Ps -> context Stage0 hp2ps +- Hsc2Hs _ -> context Stage0 hsc2hs +- Unlit -> context Stage0 unlit ++ Hp2Ps -> context stage0Boot hp2ps + _ -> Nothing + where + context s p = Just $ vanillaContext s p +@@ -226,19 +228,19 @@ instance H.Builder Builder where + Autoreconf dir -> return [dir -/- "configure.ac"] + Configure dir -> return [dir -/- "configure"] + +- Ghc _ Stage0 -> do ++ Ghc _ (Stage0 {}) -> do + -- Read the boot GHC version here to make sure we rebuild when it + -- changes (#18001). + _bootGhcVersion <- setting GhcVersion + pure [] + Ghc _ stage -> do + root <- buildRoot +- touchyPath <- programPath (vanillaContext Stage0 touchy) ++ touchyPath <- programPath (vanillaContext (Stage0 InTreeLibs) touchy) + unlitPath <- builderPath Unlit + + -- GHC from the previous stage is used to build artifacts in the + -- current stage. Need the previous stage's GHC deps. +- ghcdeps <- ghcBinDeps (pred stage) ++ ghcdeps <- ghcBinDeps (predStage stage) + + return $ [ unlitPath ] + ++ ghcdeps +@@ -396,15 +398,15 @@ isOptional = \case + systemBuilderPath :: Builder -> Action FilePath + systemBuilderPath builder = case builder of + Alex -> fromKey "alex" +- Ar _ Stage0 -> fromKey "system-ar" ++ Ar _ (Stage0 {})-> fromKey "system-ar" + Ar _ _ -> fromKey "ar" + Autoreconf _ -> stripExe =<< fromKey "autoreconf" +- Cc _ Stage0 -> fromKey "system-cc" ++ Cc _ (Stage0 {}) -> fromKey "system-cc" + Cc _ _ -> fromKey "cc" + -- We can't ask configure for the path to configure! + Configure _ -> return "configure" +- Ghc _ Stage0 -> fromKey "system-ghc" +- GhcPkg _ Stage0 -> fromKey "system-ghc-pkg" ++ Ghc _ (Stage0 {}) -> fromKey "system-ghc" ++ GhcPkg _ (Stage0 {}) -> fromKey "system-ghc-pkg" + Happy -> fromKey "happy" + HsCpp -> fromKey "hs-cpp" + Ld _ -> fromKey "ld" +@@ -416,7 +418,7 @@ systemBuilderPath builder = case builder of + -- parameters. E.g. building a cross-compiler on and for x86_64 + -- which will target ppc64 means that MergeObjects Stage0 will use + -- x86_64 linker and MergeObject _ will use ppc64 linker. +- MergeObjects Stage0 -> fromKey "system-merge-objects" ++ MergeObjects (Stage0 {}) -> fromKey "system-merge-objects" + MergeObjects _ -> fromKey "merge-objects" + Make _ -> fromKey "make" + Makeinfo -> fromKey "makeinfo" +diff --git a/hadrian/src/Context.hs b/hadrian/src/Context.hs +index ad6ead3f9b7..ae1f3299733 100644 +--- a/hadrian/src/Context.hs ++++ b/hadrian/src/Context.hs +@@ -57,7 +57,7 @@ libPath Context {..} = buildRoot <&> (-/- (stageString stage -/- "lib")) + distDir :: Stage -> Action FilePath + distDir st = do + let (os,arch) = case st of +- Stage0 -> (HostOs , HostArch) ++ Stage0 {} -> (HostOs , HostArch) + _ -> (TargetOs, TargetArch) + version <- ghcVersionStage st + hostOs <- cabalOsString <$> setting os +diff --git a/hadrian/src/Expression.hs b/hadrian/src/Expression.hs +index 3d6b9b896cd..14b08cb0e98 100644 +--- a/hadrian/src/Expression.hs ++++ b/hadrian/src/Expression.hs +@@ -111,7 +111,10 @@ compiler. + + -- | Is the build currently in stage 0? + stage0 :: Predicate +-stage0 = stage Stage0 ++stage0 = p <$> getStage ++ where ++ p (Stage0 {}) = True ++ p _ = False + + -- | Is the build currently in stage 1? + stage1 :: Predicate +@@ -123,7 +126,8 @@ stage2 = stage Stage2 + + -- | Is the build /not/ in stage 0 right now? + notStage0 :: Predicate +-notStage0 = notM stage0 ++notStage0 = notM Expression.stage0 ++ + + -- | Whether or not the bootstrapping compiler provides a threaded RTS. We need + -- to know this when building stage 1, since stage 1 links against the +diff --git a/hadrian/src/Flavour.hs b/hadrian/src/Flavour.hs +index 46fdd9abaff..0d3175525d4 100644 +--- a/hadrian/src/Flavour.hs ++++ b/hadrian/src/Flavour.hs +@@ -517,7 +517,7 @@ builderSetting = + , ("deps", FindCDependencies CDep) + ] + +- stages = map (\stg -> (stageString stg, stg)) [minBound..maxBound] ++ stages = map (\stg -> (stageString stg, stg)) allStages + + pkgs = map (\pkg -> (pkgName pkg, pkg)) (ghcPackages ++ userPackages) + +diff --git a/hadrian/src/Hadrian/BuildPath.hs b/hadrian/src/Hadrian/BuildPath.hs +index 8e059ce7d49..8d2806b5879 100644 +--- a/hadrian/src/Hadrian/BuildPath.hs ++++ b/hadrian/src/Hadrian/BuildPath.hs +@@ -72,10 +72,10 @@ parseGhcPkgPath root after = do + -- To be kept in sync with Stage.hs's stageString function + -- | Parse @"stageX"@ into a 'Stage'. + parseStage :: Parsec.Parsec String () Stage +-parseStage = (Parsec.string "stage" *> Parsec.choice +- [ Parsec.string (show n) $> toEnum n +- | n <- map fromEnum [minBound .. maxBound :: Stage] +- ]) Parsec.<?> "stage string" ++parseStage = Parsec.choice ++ [ n <$ Parsec.try (Parsec.string (stageString n)) ++ | n <- allStages ++ ] Parsec.<?> "stage string" + + -- To be kept in sync with the show instances in 'Way.Type', until we perhaps + -- use some bidirectional parsing/pretty printing approach or library. +diff --git a/hadrian/src/Oracles/Setting.hs b/hadrian/src/Oracles/Setting.hs +index 62a1ebcd67a..dca0861869a 100644 +--- a/hadrian/src/Oracles/Setting.hs ++++ b/hadrian/src/Oracles/Setting.hs +@@ -182,15 +182,19 @@ setting key = lookupSystemConfig $ case key of + TargetHasRtsLinker -> "target-has-rts-linker" + BourneShell -> "bourne-shell" + ++bootIsStage0 :: Stage -> Stage ++bootIsStage0 (Stage0 {}) = Stage0 InTreeLibs ++bootIsStage0 s = s ++ + -- | Look up the value of a 'SettingList' in @cfg/system.config@, tracking the + -- result. + settingList :: SettingList -> Action [String] + settingList key = fmap words $ lookupSystemConfig $ case key of +- ConfCcArgs stage -> "conf-cc-args-" ++ stageString stage +- ConfCppArgs stage -> "conf-cpp-args-" ++ stageString stage +- ConfGccLinkerArgs stage -> "conf-gcc-linker-args-" ++ stageString stage +- ConfLdLinkerArgs stage -> "conf-ld-linker-args-" ++ stageString stage +- ConfMergeObjectsArgs stage -> "conf-merge-objects-args-" ++ stageString stage ++ ConfCcArgs stage -> "conf-cc-args-" ++ stageString (bootIsStage0 stage) ++ ConfCppArgs stage -> "conf-cpp-args-" ++ stageString (bootIsStage0 stage) ++ ConfGccLinkerArgs stage -> "conf-gcc-linker-args-" ++ stageString (bootIsStage0 stage) ++ ConfLdLinkerArgs stage -> "conf-ld-linker-args-" ++ stageString (bootIsStage0 stage) ++ ConfMergeObjectsArgs stage -> "conf-merge-objects-args-" ++ stageString (bootIsStage0 stage) + HsCppArgs -> "hs-cpp-args" + + -- | Look up the value of a 'SettingList' in @cfg/system.config@, tracking the +@@ -316,7 +320,7 @@ topDirectory :: Action FilePath + topDirectory = fixAbsolutePathOnWindows =<< setting GhcSourcePath + + ghcVersionStage :: Stage -> Action String +-ghcVersionStage Stage0 = setting GhcVersion ++ghcVersionStage (Stage0 {}) = setting GhcVersion + ghcVersionStage _ = setting ProjectVersion + + -- | The file suffix used for libraries of a given build 'Way'. For example, +diff --git a/hadrian/src/Oracles/TestSettings.hs b/hadrian/src/Oracles/TestSettings.hs +index 79564914148..5a27e0c5fb0 100644 +--- a/hadrian/src/Oracles/TestSettings.hs ++++ b/hadrian/src/Oracles/TestSettings.hs +@@ -118,7 +118,7 @@ fullPath stage pkg = programPath =<< programContext stage pkg + -- stage 1 ghc lives under stage0/bin, + -- stage 2 ghc lives under stage1/bin, etc + stageOfTestCompiler :: String -> Maybe Stage +-stageOfTestCompiler "stage1" = Just Stage0 ++stageOfTestCompiler "stage1" = Just stage0InTree + stageOfTestCompiler "stage2" = Just Stage1 + stageOfTestCompiler "stage3" = Just Stage2 + stageOfTestCompiler _ = Nothing +diff --git a/hadrian/src/Rules.hs b/hadrian/src/Rules.hs +index 521c0ac154a..9b432b89662 100644 +--- a/hadrian/src/Rules.hs ++++ b/hadrian/src/Rules.hs +@@ -32,16 +32,12 @@ import Settings.Program (programContext) + import Target + import UserSettings + +- +-allStages :: [Stage] +-allStages = [minBound .. maxBound] +- + -- | This rule calls 'need' on all top-level build targets that Hadrian builds + -- by default, respecting the 'finalStage' flag. + topLevelTargets :: Rules () + topLevelTargets = action $ do + verbosity <- getVerbosity +- forM_ [ Stage1 ..] $ \stage -> do ++ forM_ [ Stage1, Stage2, Stage3] $ \stage -> do + when (verbosity >= Verbose) $ do + (libraries, programs) <- partition isLibrary <$> stagePackages stage + libNames <- mapM (name stage) libraries +@@ -52,14 +48,14 @@ topLevelTargets = action $ do + putInfo . unlines $ + [ stageHeader "libraries" libNames + , stageHeader "programs" pgmNames ] +- let buildStages = [ s | s <- [Stage0 ..], s < finalStage ] ++ let buildStages = [ s | s <- allStages, s < finalStage ] + targets <- concatForM buildStages $ \stage -> do + packages <- stagePackages stage + mapM (path stage) packages + + -- Why we need wrappers: https://gitlab.haskell.org/ghc/ghc/issues/16534. + root <- buildRoot +- let wrappers = [ root -/- ("ghc-" ++ stageString s) | s <- [Stage1 ..] ++ let wrappers = [ root -/- ("ghc-" ++ stageString s) | s <- [Stage1, Stage2, Stage3] + , s < finalStage ] + need (targets ++ wrappers) + where +@@ -117,7 +113,7 @@ packageRules = do + Rules.Program.buildProgramRules readPackageDb + Rules.Register.configurePackageRules + +- forM_ [Stage0 ..] (Rules.Register.registerPackageRules writePackageDb) ++ forM_ allStages (Rules.Register.registerPackageRules writePackageDb) + + -- TODO: Can we get rid of this enumeration of contexts? Since we iterate + -- over it to generate all 4 types of rules below, all the time, we +diff --git a/hadrian/src/Rules/BinaryDist.hs b/hadrian/src/Rules/BinaryDist.hs +index 9c98c85371a..39026430799 100644 +--- a/hadrian/src/Rules/BinaryDist.hs ++++ b/hadrian/src/Rules/BinaryDist.hs +@@ -204,17 +204,6 @@ bindistRules = do + cmd_ (bindistFilesDir -/- "bin" -/- ghcPkgName) ["recache"] + + +- -- HACK: Drop stuff from lintersCommon package as this for GHC developers and not of interest to end-users (#21203) +- pkg_id <- pkgIdentifier lintersCommon +- cmd_ (bindistFilesDir -/- "bin" -/- ghcPkgName) ["unregister", pkg_id] +- removeDirectory (bindistFilesDir -/- "lib" -/- distDir -/- pkg_id) +- +- removeFile =<< +- ((bindistFilesDir -/- "lib" -/- distDir) -/-) +- <$> pkgRegisteredLibraryFileName (Context Stage1 lintersCommon dynamic) +- +- +- + -- The settings file must be regenerated by the bindist installation + -- logic to account for the environment discovered by the bindist + -- configure script on the host. Not on Windows, however, where +diff --git a/hadrian/src/Rules/Clean.hs b/hadrian/src/Rules/Clean.hs +index 26a279d1780..19e7f3be5b2 100644 +--- a/hadrian/src/Rules/Clean.hs ++++ b/hadrian/src/Rules/Clean.hs +@@ -22,7 +22,7 @@ clean = do + cleanSourceTree :: Action () + cleanSourceTree = do + path <- buildRoot +- forM_ [Stage0 ..] $ removeDirectory . (path -/-) . stageString ++ forM_ allStages $ removeDirectory . (path -/-) . stageString + removeDirectory "sdistprep" + + cleanMingwTarballs :: Action () +diff --git a/hadrian/src/Rules/Generate.hs b/hadrian/src/Rules/Generate.hs +index ca96302db37..33a392fc33c 100644 +--- a/hadrian/src/Rules/Generate.hs ++++ b/hadrian/src/Rules/Generate.hs +@@ -55,7 +55,7 @@ rtsDependencies = do + genapplyDependencies :: Expr [FilePath] + genapplyDependencies = do + stage <- getStage +- rtsPath <- expr (rtsBuildPath $ succ stage) ++ rtsPath <- expr (rtsBuildPath $ succStage stage) + ((stage /= Stage3) ?) $ pure $ ((rtsPath -/- "include") -/-) <$> + [ "ghcautoconf.h", "ghcplatform.h" ] + +@@ -175,7 +175,7 @@ genPlatformConstantsHeader context file = do + copyRules :: Rules () + copyRules = do + root <- buildRootRules +- forM_ [Stage0 ..] $ \stage -> do ++ forM_ allStages $ \stage -> do + let prefix = root -/- stageString stage -/- "lib" + + infixl 1 <~ +@@ -203,7 +203,7 @@ generateRules = do + (root -/- "ghc-stage2") <~+ ghcWrapper Stage2 + (root -/- "ghc-stage3") <~+ ghcWrapper Stage3 + +- forM_ [Stage0 ..] $ \stage -> do ++ forM_ allStages $ \stage -> do + let prefix = root -/- stageString stage -/- "lib" + go gen file = generate file (semiEmptyTarget stage) gen + (prefix -/- "settings") %> go generateSettings +@@ -227,11 +227,11 @@ emptyTarget = vanillaContext (error "Rules.Generate.emptyTarget: unknown stage") + -- | GHC wrapper scripts used for passing the path to the right package database + -- when invoking in-tree GHC executables. + ghcWrapper :: Stage -> Expr String +-ghcWrapper Stage0 = error "Stage0 GHC does not require a wrapper script to run." ++ghcWrapper (Stage0 {}) = error "Stage0 GHC does not require a wrapper script to run." + ghcWrapper stage = do + dbPath <- expr $ (</>) <$> topDirectory <*> packageDbPath stage + ghcPath <- expr $ (</>) <$> topDirectory +- <*> programPath (vanillaContext (pred stage) ghc) ++ <*> programPath (vanillaContext (predStage stage) ghc) + return $ unwords $ map show $ [ ghcPath ] + ++ (if stage == Stage1 + then ["-no-global-package-db" +@@ -250,7 +250,7 @@ generateGhcPlatformH :: Expr String + generateGhcPlatformH = do + trackGenerateHs + stage <- getStage +- let chooseSetting x y = getSetting $ if stage == Stage0 then x else y ++ let chooseSetting x y = getSetting $ case stage of { Stage0 {} -> x; _ -> y } + buildPlatform <- chooseSetting BuildPlatform HostPlatform + buildArch <- chooseSetting BuildArch HostArch + buildOs <- chooseSetting BuildOs HostOs +@@ -365,7 +365,7 @@ generateSettings = do + generateConfigHs :: Expr String + generateConfigHs = do + stage <- getStage +- let chooseSetting x y = getSetting $ if stage == Stage0 then x else y ++ let chooseSetting x y = getSetting $ case stage of { Stage0 {} -> x; _ -> y } + buildPlatform <- chooseSetting BuildPlatform HostPlatform + hostPlatform <- chooseSetting HostPlatform TargetPlatform + trackGenerateHs +@@ -398,8 +398,15 @@ generateConfigHs = do + , "cBooterVersion = " ++ show cBooterVersion + , "" + , "cStage :: String" +- , "cStage = show (" ++ show (fromEnum stage + 1) ++ " :: Int)" ++ , "cStage = show (" ++ stageString stage ++ " :: Int)" + ] ++ where ++ stageString (Stage0 InTreeLibs) = "1" ++ stageString Stage1 = "2" ++ stageString Stage2 = "3" ++ stageString Stage3 = "4" ++ stageString (Stage0 GlobalLibs) = error "stageString: StageBoot" ++ + + -- | Generate @ghcautoconf.h@ header. + generateGhcAutoconfH :: Expr String +diff --git a/hadrian/src/Rules/Libffi.hs b/hadrian/src/Rules/Libffi.hs +index 8e62461202b..860d06b1166 100644 +--- a/hadrian/src/Rules/Libffi.hs ++++ b/hadrian/src/Rules/Libffi.hs +@@ -156,7 +156,7 @@ libffiRules :: Rules () + libffiRules = do + _ <- addOracleCache $ \ (LibffiDynLibs stage) + -> readFileLines =<< dynLibManifest stage +- forM_ [Stage1 ..] $ \stage -> do ++ forM_ [Stage1, Stage2, Stage3] $ \stage -> do + root <- buildRootRules + let path = root -/- stageString stage + libffiPath = path -/- pkgName libffi -/- "build" +diff --git a/hadrian/src/Rules/Program.hs b/hadrian/src/Rules/Program.hs +index ad91e941cb0..076c22987b1 100644 +--- a/hadrian/src/Rules/Program.hs ++++ b/hadrian/src/Rules/Program.hs +@@ -36,7 +36,7 @@ buildProgramRules rs = do + writeFile' stampPath "OK" + + -- Rules for programs that are actually built by hadrian. +- forM_ [Stage0 ..] $ \stage -> ++ forM_ allStages $ \stage -> + [ root -/- stageString stage -/- "bin" -/- "*" + , root -/- stageString stage -/- "lib/bin" -/- "*" ] |%> \bin -> do + programContexts <- getProgramContexts stage +@@ -78,13 +78,13 @@ lookupProgramContext wholePath progs = lookup (takeFileName wholePath) progs + + buildProgram :: FilePath -> Context -> [(Resource, Int)] -> Action () + buildProgram bin ctx@(Context{..}) rs = do +- -- Custom dependencies: this should be modeled better in the +- -- Cabal file somehow. +- -- TODO: Is this still needed? See 'runtimeDependencies'. ++ + when (package == hsc2hs) $ do + -- 'Hsc2hs' needs the @template-hsc.h@ file. + template <- templateHscPath stage + need [template] ++ -- Custom dependencies: this should be modeled better in the ++ -- Cabal file somehow. + when (package == ghc) $ do + need =<< ghcBinDeps stage + when (package == haddock) $ do +@@ -102,18 +102,18 @@ buildProgram bin ctx@(Context{..}) rs = do + cross <- flag CrossCompiling + -- For cross compiler, copy @stage0/bin/<pgm>@ to @stage1/bin/@. + case (cross, stage) of +- (True, s) | s > Stage0 -> do +- srcDir <- buildRoot <&> (-/- (stageString Stage0 -/- "bin")) ++ (True, s) | s > stage0InTree -> do ++ srcDir <- buildRoot <&> (-/- (stageString stage0InTree -/- "bin")) + copyFile (srcDir -/- takeFileName bin) bin +- (False, s) | s > Stage0 && (package `elem` [touchy, unlit]) -> do +- srcDir <- stageLibPath Stage0 <&> (-/- "bin") ++ (False, s) | s > stage0InTree && (package `elem` [touchy, unlit]) -> do ++ srcDir <- stageLibPath stage0InTree <&> (-/- "bin") + copyFile (srcDir -/- takeFileName bin) bin + _ -> buildBinary rs bin ctx + + buildBinary :: [(Resource, Int)] -> FilePath -> Context -> Action () + buildBinary rs bin context@Context {..} = do + needLibrary =<< contextDependencies context +- when (stage > Stage0) $ do ++ when (stage > stage0InTree) $ do + ways <- interpretInContext context (getLibraryWays <> getRtsWays) + needLibrary [ (rtsContext stage) { way = w } | w <- ways ] + asmSrcs <- interpretInContext context (getContextData asmSrcs) +diff --git a/hadrian/src/Rules/Register.hs b/hadrian/src/Rules/Register.hs +index 8527864f776..64b32283cb0 100644 +--- a/hadrian/src/Rules/Register.hs ++++ b/hadrian/src/Rules/Register.hs +@@ -109,11 +109,12 @@ registerPackageRules rs stage = do + + when (pkg == compiler) $ need =<< ghcLibDeps stage + +- isBoot <- (pkg `notElem`) <$> stagePackages Stage0 ++ -- Only used in guard when Stage0 {} but can be GlobalLibs or InTreeLibs ++ isBoot <- (pkg `notElem`) <$> stagePackages stage + + let ctx = Context stage pkg vanilla + case stage of +- Stage0 | isBoot -> copyConf rs ctx conf ++ Stage0 _ | isBoot -> copyConf rs ctx conf + _ -> buildConf rs ctx conf + + buildConf :: [(Resource, Int)] -> Context -> FilePath -> Action () +diff --git a/hadrian/src/Rules/Rts.hs b/hadrian/src/Rules/Rts.hs +index 9a18a41c46f..cb3026cd32e 100644 +--- a/hadrian/src/Rules/Rts.hs ++++ b/hadrian/src/Rules/Rts.hs +@@ -24,7 +24,7 @@ rtsRules = priority 3 $ do + rtsLibFilePath' + + -- Libffi +- forM_ [Stage1 ..] $ \ stage -> do ++ forM_ [Stage1, Stage2, Stage3 ] $ \ stage -> do + let buildPath = root -/- buildDir (rtsContext stage) + + -- Header files +diff --git a/hadrian/src/Rules/Selftest.hs b/hadrian/src/Rules/Selftest.hs +index bd7e5f95445..eae902013fa 100644 +--- a/hadrian/src/Rules/Selftest.hs ++++ b/hadrian/src/Rules/Selftest.hs +@@ -62,10 +62,10 @@ testDependencies = do + putBuild "==== Dependencies of the 'ghc-bin' binary" + ghcDeps <- pkgDependencies ghc + test $ pkgName compiler `elem` ghcDeps +- stage0Deps <- contextDependencies (vanillaContext Stage0 ghc) ++ stage0Deps <- contextDependencies (vanillaContext stage0InTree ghc) + stage1Deps <- contextDependencies (vanillaContext Stage1 ghc) + stage2Deps <- contextDependencies (vanillaContext Stage2 ghc) +- test $ vanillaContext Stage0 compiler `notElem` stage1Deps ++ test $ vanillaContext stage0InTree compiler `notElem` stage1Deps + test $ vanillaContext Stage1 compiler `elem` stage1Deps + test $ vanillaContext Stage2 compiler `notElem` stage1Deps + test $ stage1Deps /= stage0Deps +@@ -102,7 +102,7 @@ testPackages :: Action () + testPackages = do + putBuild "==== Check system configuration" + putBuild "==== Packages, interpretInContext, configuration flags" +- forM_ [Stage0 ..] $ \stage -> do ++ forM_ allStages $ \stage -> do + pkgs <- stagePackages stage + when (win32 `elem` pkgs) . test $ windowsHost + when (unix `elem` pkgs) . test $ not windowsHost +diff --git a/hadrian/src/Rules/SimpleTargets.hs b/hadrian/src/Rules/SimpleTargets.hs +index e6c42907de0..f89575fccb9 100644 +--- a/hadrian/src/Rules/SimpleTargets.hs ++++ b/hadrian/src/Rules/SimpleTargets.hs +@@ -23,7 +23,7 @@ simplePackageTargets :: Rules () + simplePackageTargets = traverse_ simpleTarget targets + + where targets = [ (stage, target) +- | stage <- [minBound..maxBound] ++ | stage <- allStages + , target <- knownPackages + ] + +@@ -53,10 +53,11 @@ getLibraryPath :: Stage -> Package -> Action FilePath + getLibraryPath stage pkg = pkgConfFile (vanillaContext stage pkg) + + getProgramPath :: Stage -> Package -> Action FilePath +-getProgramPath Stage0 _ = +- error ("Cannot build a stage 0 executable target: " ++ +- "it is the boot compiler's toolchain") +-getProgramPath stage pkg = programPath (vanillaContext (pred stage) pkg) ++getProgramPath stage pkg = ++ case stage of ++ (Stage0 GlobalLibs) -> error "Can't build executable in stageBoot" ++ (Stage0 InTreeLibs) -> programPath (vanillaContext stage0Boot pkg) ++ s -> programPath (vanillaContext (predStage s) pkg) + + + -- | A phony @autocomplete@ rule that prints all valid setting keys +diff --git a/hadrian/src/Rules/SourceDist.hs b/hadrian/src/Rules/SourceDist.hs +index 69941d5d5ff..a673fb434c5 100644 +--- a/hadrian/src/Rules/SourceDist.hs ++++ b/hadrian/src/Rules/SourceDist.hs +@@ -151,12 +151,12 @@ prepareTree dest = do + + -- (stage, package, input file, output file) + alexHappyFiles = +- [ (Stage0, compiler, "GHC/Cmm/Parser.y", "GHC/Cmm/Parser.hs") +- , (Stage0, compiler, "GHC/Cmm/Lexer.x", "GHC/Cmm/Lexer.hs") +- , (Stage0, compiler, "GHC/Parser.y", "GHC/Parser.hs") +- , (Stage0, compiler, "GHC/Parser/Lexer.x", "GHC/Parser/Lexer.hs") +- , (Stage0, compiler, "GHC/Parser/HaddockLex.x", "GHC/Parser/HaddockLex.hs") +- , (Stage0, hpcBin, "HpcParser.y", "HpcParser.hs") +- , (Stage0, genprimopcode, "Parser.y", "Parser.hs") +- , (Stage0, genprimopcode, "Lexer.x", "Lexer.hs") ++ [ (stage0InTree , compiler, "GHC/Cmm/Parser.y", "GHC/Cmm/Parser.hs") ++ , (stage0InTree , compiler, "GHC/Cmm/Lexer.x", "GHC/Cmm/Lexer.hs") ++ , (stage0InTree , compiler, "GHC/Parser.y", "GHC/Parser.hs") ++ , (stage0InTree , compiler, "GHC/Parser/Lexer.x", "GHC/Parser/Lexer.hs") ++ , (stage0InTree , compiler, "GHC/Parser/HaddockLex.x", "GHC/Parser/HaddockLex.hs") ++ , (stage0InTree , hpcBin, "HpcParser.y", "HpcParser.hs") ++ , (stage0InTree , genprimopcode, "Parser.y", "Parser.hs") ++ , (stage0InTree , genprimopcode, "Lexer.x", "Lexer.hs") + ] +diff --git a/hadrian/src/Rules/Test.hs b/hadrian/src/Rules/Test.hs +index f12d7890b89..23b94295535 100644 +--- a/hadrian/src/Rules/Test.hs ++++ b/hadrian/src/Rules/Test.hs +@@ -66,8 +66,8 @@ checkPrograms = + [ CheckProgram "test:check-ppr" checkPprProgPath checkPprSourcePath checkPprExtra checkPpr id id + , CheckProgram "test:check-exact" checkExactProgPath checkExactSourcePath checkExactExtra checkExact id id + , CheckProgram "test:count-deps" countDepsProgPath countDepsSourcePath countDepsExtra countDeps id id +- , CheckProgram "lint:notes" noteLinterProgPath noteLinterSourcePath noteLinterExtra lintNotes (const Stage0) id +- , CheckProgram "lint:whitespace" whitespaceLinterProgPath whitespaceLinterSourcePath whitespaceLinterExtra lintWhitespace (const Stage0) (filter (/= lintersCommon)) ++ , CheckProgram "lint:notes" noteLinterProgPath noteLinterSourcePath noteLinterExtra lintNotes (const stage0Boot) id ++ , CheckProgram "lint:whitespace" whitespaceLinterProgPath whitespaceLinterSourcePath whitespaceLinterExtra lintWhitespace (const stage0Boot) (filter (/= lintersCommon)) + ] + + inTreeOutTree :: (Stage -> Action b) -> Action b -> Action b +@@ -162,7 +162,7 @@ testRules = do + ghcPath <- getCompilerPath testGhc + whenJust (stageOf testGhc) $ \stg -> + need . (:[]) =<< programPath (Context stg ghc vanilla) +- ghcConfigProgPath <- programPath =<< programContext Stage0 ghcConfig ++ ghcConfigProgPath <- programPath =<< programContext stage0InTree ghcConfig + cwd <- liftIO $ IO.getCurrentDirectory + need [makeRelative cwd ghcPath, ghcConfigProgPath] + cmd [FileStdout $ root -/- ghcConfigPath] ghcConfigProgPath [ghcPath] +@@ -256,7 +256,7 @@ timeoutProgBuilder = do + root <- buildRoot + if windowsHost + then do +- prog <- programPath =<< programContext Stage0 timeout ++ prog <- programPath =<< programContext stage0InTree timeout + copyFile prog (root -/- timeoutPath) + else do + python <- builderPath Python +@@ -272,26 +272,26 @@ needTestsuitePackages :: Stage -> Action () + needTestsuitePackages stg = do + allpkgs <- packages <$> flavour + -- We need the libraries of the successor stage +- libpkgs <- map (Stage1,) . filter isLibrary <$> allpkgs (succ stg) ++ libpkgs <- map (Stage1,) . filter isLibrary <$> allpkgs (succStage stg) + -- And the executables of the current stage + exepkgs <- map (stg,) . filter isProgram <$> allpkgs stg + -- Don't require lib:ghc or lib:cabal when testing the stage1 compiler + -- This is a hack, but a major usecase for testing the stage1 compiler is + -- so that we can use it even if ghc stage2 fails to build + -- Unfortunately, we still need the liba +- let pkgs = filter ((_,p) -> not $ "iserv" `isInfixOf` pkgName p || ((pkgName p `elem` ["ghc", "Cabal"]) && stg == Stage0)) ++ let pkgs = filter ((_,p) -> not $ "iserv" `isInfixOf` pkgName p || ((pkgName p `elem` ["ghc", "Cabal"]) && isStage0 stg)) + (libpkgs ++ exepkgs ++ [ (stg,timeout) | windowsHost ]) + need =<< mapM (uncurry pkgFile) pkgs + cross <- flag CrossCompiling + when (not cross) $ needIservBins stg + root <- buildRoot + -- require the shims for testing stage1 +- need =<< sequence [(\f -> root -/- "stage1-test/bin" -/- takeFileName f) <$> (pkgFile Stage0 p) | (Stage0,p) <- exepkgs] ++ need =<< sequence [(\f -> root -/- "stage1-test/bin" -/- takeFileName f) <$> (pkgFile stage0InTree p) | (Stage0 InTreeLibs,p) <- exepkgs] + + -- stage 1 ghc lives under stage0/bin, + -- stage 2 ghc lives under stage1/bin, etc + stageOf :: String -> Maybe Stage +-stageOf "stage1" = Just Stage0 ++stageOf "stage1" = Just stage0InTree + stageOf "stage2" = Just Stage1 + stageOf "stage3" = Just Stage2 + stageOf _ = Nothing +@@ -305,7 +305,7 @@ needIservBins stg = do + -- Only build iserv binaries if all dependencies are built the right + -- way already. In particular this fixes the case of no_profiled_libs + -- not working with the testsuite, see #19624 +- canBuild Stage0 _ = pure Nothing ++ canBuild (Stage0 {}) _ = pure Nothing + canBuild stg w = do + contextDeps <- contextDependencies (Context stg iserv w) + ws <- forM contextDeps $ \c -> +diff --git a/hadrian/src/Rules/ToolArgs.hs b/hadrian/src/Rules/ToolArgs.hs +index eff690cd9bb..105ed8f15a8 100644 +--- a/hadrian/src/Rules/ToolArgs.hs ++++ b/hadrian/src/Rules/ToolArgs.hs +@@ -49,8 +49,8 @@ mkToolTarget es p = do + -- This builds automatically generated dependencies. Not sure how to do + -- this generically yet. + allDeps +- let fake_target = target (Context Stage0 p (if windowsHost then vanilla else dynamic)) +- (Ghc ToolArgs Stage0) [] ["ignored"] ++ let fake_target = target (Context stage0InTree p (if windowsHost then vanilla else dynamic)) ++ (Ghc ToolArgs stage0InTree) [] ["ignored"] + arg_list <- interpret fake_target getArgs + liftIO $ putStrLn (intercalate "\n" (arg_list ++ es)) + allDeps :: Action () +@@ -59,14 +59,14 @@ allDeps = do + -- We can't build DLLs on Windows (yet). Actually we should only + -- include the dynamic way when we have a dynamic host GHC, but just + -- checking for Windows seems simpler for now. +- let fake_target = target (Context Stage0 compiler (if windowsHost then vanilla else dynamic)) +- (Ghc ToolArgs Stage0) [] ["ignored"] ++ let fake_target = target (Context stage0InTree compiler (if windowsHost then vanilla else dynamic)) ++ (Ghc ToolArgs stage0InTree) [] ["ignored"] + + -- need the autogenerated files so that they are precompiled + interpret fake_target Rules.Generate.compilerDependencies >>= need + + root <- buildRoot +- let dir = buildDir (vanillaContext Stage0 compiler) ++ let dir = buildDir (vanillaContext stage0InTree compiler) + need [ root -/- dir -/- "GHC" -/- "Settings" -/- "Config.hs" ] + need [ root -/- dir -/- "GHC" -/- "Parser.hs" ] + need [ root -/- dir -/- "GHC" -/- "Parser" -/- "Lexer.hs" ] +@@ -114,12 +114,12 @@ dirMap = do + -- configuring would build the whole GHC library which we probably + -- don't want to do. + mkGhc = do +- let c = (Context Stage0 compiler (if windowsHost then vanilla else dynamic)) ++ let c = (Context stage0InTree compiler (if windowsHost then vanilla else dynamic)) + cd <- readContextData c + fp <- liftIO $ canonicalizePath "ghc/" + return (fp, (compiler, "-ighc" : modules cd ++ otherModules cd ++ ["ghc/Main.hs"])) + go p = do +- let c = (Context Stage0 p (if windowsHost then vanilla else dynamic)) ++ let c = (Context stage0InTree p (if windowsHost then vanilla else dynamic)) + -- readContextData has the effect of configuring the package so all + -- dependent packages will also be built. + cd <- readContextData c +diff --git a/hadrian/src/Settings/Builders/Cabal.hs b/hadrian/src/Settings/Builders/Cabal.hs +index 82e34d85949..4486ab002b1 100644 +--- a/hadrian/src/Settings/Builders/Cabal.hs ++++ b/hadrian/src/Settings/Builders/Cabal.hs +@@ -39,7 +39,7 @@ cabalInstallArgs = builder (Cabal Install) ? do + -- of the stage 2 compiler + assertNoBuildRootLeak :: Args -> Args + assertNoBuildRootLeak args = do +- libPaths <- expr $ mapM stageLibPath [Stage0 ..] ++ libPaths <- expr $ mapM stageLibPath allStages + xs <- args + pure $ assert (not $ any (\arg -> or [libPath `isInfixOf` arg && not ("package.conf.d" `isSuffixOf` arg) + | libPath <- libPaths]) xs) +@@ -205,8 +205,8 @@ configureArgs cFlags' ldFlags' = do + ] + + bootPackageConstraints :: Args +-bootPackageConstraints = stage0 ? do +- bootPkgs <- expr $ stagePackages Stage0 ++bootPackageConstraints = (stage0InTree ==) <$> getStage ? do ++ bootPkgs <- expr $ stagePackages stage0InTree + let pkgs = filter (\p -> p /= compiler && isLibrary p) bootPkgs + constraints <- expr $ forM (sort pkgs) $ \pkg -> do + version <- pkgVersion pkg +diff --git a/hadrian/src/Settings/Builders/Ghc.hs b/hadrian/src/Settings/Builders/Ghc.hs +index 3804c7ecc9e..7deb22f1793 100644 +--- a/hadrian/src/Settings/Builders/Ghc.hs ++++ b/hadrian/src/Settings/Builders/Ghc.hs +@@ -24,7 +24,7 @@ ghcBuilderArgs = mconcat + -- config at build time. + -- See Note [Genapply target as host for RTS macros]. + stage <- getStage +- nextStageRtsBuildDir <- expr $ rtsBuildPath $ succ stage ++ nextStageRtsBuildDir <- expr $ rtsBuildPath $ succStage stage + let nextStageRtsBuildIncludeDir = nextStageRtsBuildDir </> "include" + builder Ghc ? arg ("-I" ++ nextStageRtsBuildIncludeDir) + , compileAndLinkHs, compileC, compileCxx, findHsDependencies +diff --git a/hadrian/src/Settings/Builders/GhcPkg.hs b/hadrian/src/Settings/Builders/GhcPkg.hs +index 752f1718dab..5de76cc7534 100644 +--- a/hadrian/src/Settings/Builders/GhcPkg.hs ++++ b/hadrian/src/Settings/Builders/GhcPkg.hs +@@ -35,7 +35,7 @@ ghcPkgBuilderArgs = mconcat + config <- expr $ pkgInplaceConfig context + stage <- getStage + pkgDb <- expr $ packageDbPath stage +- mconcat [ notStage0 ? use_db pkgDb ++ mconcat [ notM stage0 ? use_db pkgDb + , arg "update" + , arg "--force" + , verbosity < Verbose ? arg "-v0" +diff --git a/hadrian/src/Settings/Builders/Hsc2Hs.hs b/hadrian/src/Settings/Builders/Hsc2Hs.hs +index f1a44b5e87a..7492f6e29ac 100644 +--- a/hadrian/src/Settings/Builders/Hsc2Hs.hs ++++ b/hadrian/src/Settings/Builders/Hsc2Hs.hs +@@ -16,10 +16,10 @@ hsc2hsBuilderArgs = builder Hsc2Hs ? do + hOs <- getSetting HostOs + tArch <- getSetting TargetArch + tOs <- getSetting TargetOs +- version <- if stage == Stage0 +- then expr ghcCanonVersion +- else getSetting ProjectVersionInt +- tmpl <- (top -/-) <$> expr (templateHscPath Stage0) ++ version <- case stage of ++ Stage0 {} -> expr ghcCanonVersion ++ _ -> getSetting ProjectVersionInt ++ tmpl <- (top -/-) <$> expr (templateHscPath stage0Boot) + mconcat [ arg $ "--cc=" ++ ccPath + , arg $ "--ld=" ++ ccPath + , notM isWinTarget ? notM (flag CrossCompiling) ? arg "--cross-safe" +diff --git a/hadrian/src/Settings/Builders/Make.hs b/hadrian/src/Settings/Builders/Make.hs +index f00aab97768..22096a08384 100644 +--- a/hadrian/src/Settings/Builders/Make.hs ++++ b/hadrian/src/Settings/Builders/Make.hs +@@ -12,7 +12,7 @@ makeBuilderArgs = do + threads <- shakeThreads <$> expr getShakeOptions + stage <- getStage + gmpPath <- expr (gmpBuildPath stage) +- libffiPaths <- forM [Stage1 ..] $ \s -> expr (libffiBuildPath s) ++ libffiPaths <- forM [Stage1, Stage2, Stage3 ] $ \s -> expr (libffiBuildPath s) + let t = show $ max 4 (threads - 2) -- Don't use all Shake's threads + mconcat $ + (builder (Make gmpPath ) ? pure ["MAKEFLAGS=-j" ++ t]) : +diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs +index 0e442cb9be5..f6b40d40653 100644 +--- a/hadrian/src/Settings/Builders/RunTest.hs ++++ b/hadrian/src/Settings/Builders/RunTest.hs +@@ -264,7 +264,7 @@ runTestBuilderArgs = builder Testsuite ? do + , arg "-e", arg $ "config.os=" ++ show os + , arg "-e", arg $ "config.arch=" ++ show arch + , arg "-e", arg $ "config.platform=" ++ show platform +- , arg "-e", arg $ "config.stage=" ++ show (fromEnum (C.stage ctx) + 1) ++ , arg "-e", arg $ "config.stage=" ++ show (stageNumber (C.stage ctx)) + + , arg "--config", arg $ "gs=gs" -- Use the default value as in test.mk + , arg "--config", arg $ "timeout_prog=" ++ show (top -/- timeoutProg) +@@ -281,6 +281,12 @@ runTestBuilderArgs = builder Testsuite ? do + where emitWhenSet Nothing _ = mempty + emitWhenSet (Just v) f = f v + ++ stageNumber (Stage0 GlobalLibs) = error "stageNumber stageBoot" ++ stageNumber (Stage0 InTreeLibs) = 1 ++ stageNumber Stage1 = 2 ++ stageNumber Stage2 = 3 ++ stageNumber Stage3 = 4 ++ + -- | Command line arguments for running GHC's test script. + getTestArgs :: Args + getTestArgs = do +diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs +index 54562b8aa3e..ae9ea2ce81b 100644 +--- a/hadrian/src/Settings/Default.hs ++++ b/hadrian/src/Settings/Default.hs +@@ -50,7 +50,8 @@ import Settings.Builders.Win32Tarballs + + -- | Packages that are built by default. You can change this in "UserSettings". + defaultPackages :: Stage -> Action [Package] +-defaultPackages Stage0 = stage0Packages ++defaultPackages (Stage0 GlobalLibs) = stageBootPackages ++defaultPackages (Stage0 InTreeLibs) = stage0Packages + defaultPackages Stage1 = stage1Packages + defaultPackages Stage2 = stage2Packages + defaultPackages Stage3 = return [] +@@ -59,20 +60,26 @@ defaultPackages Stage3 = return [] + defaultBignumBackend :: String + defaultBignumBackend = "gmp" + ++-- These packages are things needed to do the build.. so they are only built by ++-- boot compiler, with global package database. By default we will only build these ++-- packages in StageBoot so if you also need to distribute anything here then add ++-- it to `stage0packages` or `stage1packages` as appropiate. ++stageBootPackages :: Action [Package] ++stageBootPackages = return [lintersCommon, lintCommitMsg, lintSubmoduleRefs, lintWhitespace, lintNotes, hsc2hs, compareSizes, deriveConstants, genapply, genprimopcode, unlit ] ++ + -- | Packages built in 'Stage0' by default. You can change this in "UserSettings". + stage0Packages :: Action [Package] + stage0Packages = do + cross <- flag CrossCompiling ++ winTarget <- isWinTarget + return $ [ binary + , bytestring + , cabalSyntax + , cabal +- , compareSizes + , compiler +- , deriveConstants ++ , directory ++ , process + , exceptions +- , genapply +- , genprimopcode + , ghc + , runGhc + , ghcBoot +@@ -85,15 +93,12 @@ stage0Packages = do + , hpcBin + , mtl + , parsec ++ , time + , templateHaskell + , text + , transformers + , unlit +- , lintersCommon +- , lintNotes +- , lintCommitMsg +- , lintSubmoduleRefs +- , lintWhitespace ++ , if winTarget then win32 else unix + ] + ++ [ terminfo | not windowsHost, not cross ] + ++ [ timeout | windowsHost ] +@@ -113,10 +118,8 @@ stage1Packages = do + [ libraries0 -- Build all Stage0 libraries in Stage1 + , [ array + , base +- , bytestring + , containers + , deepseq +- , directory + , exceptions + , filepath + , ghc +@@ -129,10 +132,8 @@ stage1Packages = do + , hsc2hs + , integerGmp + , pretty +- , process + , rts + , stm +- , time + , unlit + , xhtml + ] +@@ -143,7 +144,6 @@ stage1Packages = do + , libiserv + , runGhc + ] +- , if winTarget then [ win32 ] else [ unix ] + , when (winTarget && not cross) + [ touchy + -- See Note [Hadrian's ghci-wrapper package] +diff --git a/hadrian/src/Settings/Flavours/Development.hs b/hadrian/src/Settings/Flavours/Development.hs +index 75c0886bce9..00831012cc1 100644 +--- a/hadrian/src/Settings/Flavours/Development.hs ++++ b/hadrian/src/Settings/Flavours/Development.hs +@@ -10,12 +10,17 @@ import {-# SOURCE #-} Settings.Default + -- Please update doc/flavours.md when changing this file. + developmentFlavour :: Stage -> Flavour + developmentFlavour ghcStage = defaultFlavour +- { name = "devel" ++ show (fromEnum ghcStage) ++ { name = "devel" ++ stageString ghcStage + , args = defaultBuilderArgs <> developmentArgs ghcStage <> defaultPackageArgs + , libraryWays = pure [vanilla] + , rtsWays = pure [vanilla, logging, debug, threaded, threadedLogging, threadedDebug] + , dynamicGhcPrograms = return False + , ghcDebugAssertions = True } ++ where ++ stageString Stage2 = "2" ++ stageString Stage1 = "1" ++ stageString Stage3 = "3" ++ stageString s = error ("developmentFlavour not support for " ++ show s) + + developmentArgs :: Stage -> Args + developmentArgs ghcStage = do +@@ -27,5 +32,5 @@ developmentArgs ghcStage = do + package cabal ? pure ["-O0"]] + , hsLibrary = notStage0 ? arg "-dcore-lint" + , hsCompiler = mconcat [stage0 ? arg "-O2", +- succ stage == ghcStage ? pure ["-O0"]] +- , hsGhc = succ stage == ghcStage ? pure ["-O0"] } ++ stage == predStage ghcStage ? pure ["-O0"]] ++ , hsGhc = stage == predStage ghcStage ? pure ["-O0"] } +diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs +index 85fd0812f65..7473a1fb5fa 100644 +--- a/hadrian/src/Settings/Packages.hs ++++ b/hadrian/src/Settings/Packages.hs +@@ -22,7 +22,7 @@ packageArgs = do + + -- Check if the bootstrap compiler has the same version as the one we + -- are building. This is used to build cross-compilers +- bootCross = (==) <$> ghcVersionStage Stage0 <*> ghcVersionStage Stage1 ++ bootCross = (==) <$> ghcVersionStage (stage0InTree) <*> ghcVersionStage Stage1 + + cursesIncludeDir <- getSetting CursesIncludeDir + cursesLibraryDir <- getSetting CursesLibDir +diff --git a/hadrian/src/Settings/Program.hs b/hadrian/src/Settings/Program.hs +index d45b2650080..62d41909d38 100644 +--- a/hadrian/src/Settings/Program.hs ++++ b/hadrian/src/Settings/Program.hs +@@ -19,6 +19,9 @@ programContext stage pkg = do + where wayFor prof dyn + | prof && dyn = + error "programContext: profiling+dynamic not supported" +- | pkg == ghc && prof && stage > Stage0 = profiling +- | dyn && stage > Stage0 = dynamic ++ | pkg == ghc && prof && notStage0 stage = profiling ++ | dyn && notStage0 stage = dynamic + | otherwise = vanilla ++ ++ notStage0 (Stage0 {}) = False ++ notStage0 _ = True +diff --git a/hadrian/src/Stage.hs b/hadrian/src/Stage.hs +index 8f243ff8d7b..be2d123e06d 100644 +--- a/hadrian/src/Stage.hs ++++ b/hadrian/src/Stage.hs +@@ -1,14 +1,19 @@ + {-# LANGUAGE LambdaCase #-} +-module Stage (Stage (..), stageString) where ++module Stage (Stage (..), WhichLibs(..), isStage0, stage0InTree, stage0Boot, allStages,predStage, succStage, stageString) where + + import Development.Shake.Classes + import GHC.Generics + + -- | A stage refers to a certain compiler in GHC's build process. + -- +--- * Stage 0 is built with the bootstrapping compiler, i.e. the one already ++-- * Stage0 GlobalLibs is for **executables** which are built with the boot compiler ++-- and boot compiler packages. For example, this was motivated by needing to ++-- build hsc2hs, a build dependency of unix with just the boot toolchain. (See #21634) ++-- ++-- * Stage 0 (InTreeLibs) is built with the bootstrapping compiler, i.e. the one already + -- installed on the user's system. The compiler that is produced during +--- stage 0 is called /stage 1 compiler/. ++-- stage 0 is called /stage 1 compiler/. Stage0 executables and libraries are ++-- build against the other libraries (in-tree) built by the stage 0 compiler. + -- + -- * Stage 1 is built using the stage 1 compiler and all GHC sources. The result + -- is called /stage 2 compiler/ and it has all features of the new GHC. +@@ -20,17 +25,81 @@ import GHC.Generics + -- the same object code as the one built in stage 2, which is a good test + -- for the compiler. Since it serves no other purpose than that, the stage 3 + -- build is usually omitted in the build process. +-data Stage = Stage0 | Stage1 | Stage2 | Stage3 +- deriving (Show, Eq, Ord, Enum, Generic, Bounded) ++data Stage = Stage0 WhichLibs | Stage1 | Stage2 | Stage3 ++ deriving (Show, Eq, Ord, Generic) ++ ++ ++-- | See Note [Stage 0 build plans] ++data WhichLibs = GlobalLibs -- ^ Build build tools against the globally installed libraries ++ | InTreeLibs -- ^ Build the compiler against the in-tree libraries. ++ deriving (Show, Eq, Ord, Generic) ++ ++allStages :: [Stage] ++allStages = [Stage0 GlobalLibs, Stage0 InTreeLibs, Stage1, Stage2, Stage3] ++ ++stage0InTree, stage0Boot :: Stage ++stage0InTree = Stage0 InTreeLibs ++stage0Boot = Stage0 GlobalLibs ++ ++isStage0 :: Stage -> Bool ++isStage0 Stage0 {} = True ++isStage0 _ = False ++ ++ ++predStage :: Stage -> Stage ++predStage Stage1 = stage0InTree ++predStage Stage2 = Stage1 ++predStage Stage3 = Stage2 ++predStage s = error ("predStage: " ++ show s) ++ ++succStage :: Stage -> Stage ++succStage (Stage0 {}) = Stage1 ++succStage Stage1 = Stage2 ++succStage Stage2 = Stage3 ++succStage Stage3 = error "succStage: Stage3" + + instance Binary Stage + instance Hashable Stage + instance NFData Stage + ++instance Binary WhichLibs ++instance Hashable WhichLibs ++instance NFData WhichLibs ++ + -- | Prettyprint a 'Stage'. + stageString :: Stage -> String + stageString = \case +- Stage0 -> "stage0" ++ Stage0 GlobalLibs -> "stageBoot" ++ Stage0 InTreeLibs -> "stage0" + Stage1 -> "stage1" + Stage2 -> "stage2" + Stage3 -> "stage3" ++ ++{- ++Note [Stage 0 build plans] ++~~~~~~~~~~~~~~~~~~~~~~~~~~ ++ ++The Stage refers to which compiler we will use to perform the builds. ++ ++ Stage0: Build with the boot toolchain ++ Stage1: Build with compiler built in stage 0 ++ Stage2: Build with compiler built in stage 1 ++ ++Stage 0 also has two different package databases. ++ ++ Stage0 GlobalLibs: Used for building build tool dependencies (hsc2hs, unlit, linters etc) ++ Mostly using the libraries from the boot compiler. ++ Stage0 InTreeLibs: Used for building the Stage 1 compiler (ghc executable) and all libraries ++ needed by that. ++ ++The reason for this split is ++ ++1. bytestring depends on template-haskell so we need to build bytestring with stage0 (and all ++ packages which depend on it). This includes unix and hence directory (which depends on unix) but ++ unix depends on hsc2hs (which depends on directory) and you get a loop in the build ++ rules if you try to build them all in the same package database. ++ The solution is to build hsc2hs with the global boot libraries in Stage0 GlobalLibs ++2. We want to build linters and other build tools which we don't distribute in a separate ++ package database so they don't end up in the bindist package database. ++ ++-} +-- +GitLab diff --git a/ghc9.4.spec b/ghc9.4.spec index ca92d0f..27442e6 100644 --- a/ghc9.4.spec +++ b/ghc9.4.spec @@ -12,7 +12,7 @@
# bootstrap from this package # NB must be in sync with GHC configure variable below -%global ghcboot ghc9.2 +%global ghcboot ghc9.0
# to handle RCs %global ghc_release 9.4.1-alpha2 @@ -69,7 +69,7 @@ Version: 9.4.0.20220523 # - release can only be reset if *all* library versions get bumped simultaneously # (sometimes after a major release) # - minor release numbers for a branch should be incremented monotonically -Release: 3%{?dist} +Release: 4%{?dist} Summary: Glasgow Haskell Compiler
License: BSD and HaskellReport @@ -101,6 +101,9 @@ Patch7: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8170.patch Patch8: https://gitlab.haskell.org/ghc/ghc/-/commit/6e12e3c178fe9ad16131eb3c089bd657... # needs ghc9.0+ Patch11: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8332.patch +# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8339 +# https://gitlab.haskell.org/ghc/ghc/-/issues/21634 (nor 9.2.3) +Patch14: 8339.patch
# arm patches Patch12: ghc-armv7-VFPv3D16--NEON.patch @@ -391,6 +394,7 @@ Installing this package causes %{name}-*-prof packages corresponding to %patch7 -p1 -b .orig %patch8 -p1 -b .orig %patch11 -p1 -b .orig +%patch14 -p1 -b .orig14
rm libffi-tarballs/libffi-*.tar.gz #sed -i -e '/libffi-tarballs/d' packages @@ -464,7 +468,7 @@ export CC=%{_bindir}/gcc export LD=%{_bindir}/ld.gold %endif
-export GHC=/usr/bin/ghc-9.2.2 +export GHC=/usr/bin/ghc-9.0.2
# * %%configure induces cross-build due to different target/host/build platform names ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \ @@ -884,6 +888,10 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%changelog +* Thu Jun 9 2022 Jens Petersen petersen@redhat.com - 9.4.0.20220523-4 +- add filesystem subpackage +- backport upstream hadrian patch to allow boot with ghc9.0 + * Wed May 25 2022 Jens Petersen petersen@redhat.com - 9.4.0.20220523-3 - 9.4.1-alpha2 - https://downloads.haskell.org/ghc/9.4.1-alpha2/docs/users_guide/9.4.1-notes....
commit e60ff1588e9efd205d84f569eaa31468d2665ab9 Author: Jens Petersen petersen@redhat.com Date: Wed Jun 8 18:10:05 2022 +0800
add ghc9.4-filesystem subpackage
diff --git a/ghc9.4.spec b/ghc9.4.spec index 9a9e6b9..ca92d0f 100644 --- a/ghc9.4.spec +++ b/ghc9.4.spec @@ -226,7 +226,7 @@ Summary: GHC compiler and utilities License: BSD Requires: gcc%{?_isa} Requires: %{name}-base-devel%{?_isa} = %{base_ver}-%{release} -Requires: ghc-filesystem +Requires: ghc-filesystem = %{version}-%{release} %if %{without haddock} Obsoletes: %{name}-doc-index < %{version}-%{release} %endif @@ -255,6 +255,15 @@ Conflicts: ghc-compiler The package contains symlinks to make %{name} the default GHC compiler.
+%package filesystem +Summary: Shared directories for Haskell documentation +BuildArch: noarch + +%description filesystem +This package provides some common directories used for +Haskell libraries documentation. + + %if %{with haddock} %package doc Summary: Haskell library documentation meta package @@ -833,6 +842,11 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%files devel
+%files filesystem +%dir %_ghc_doc_dir +%dir %ghc_html_dir +%dir %ghc_html_libraries_dir + %if %{with haddock} %files doc %if %{with hadrian}
commit ae716f509224b9a86e0512fef8bc8f024ba3a796 Author: Jens Petersen petersen@redhat.com Date: Tue May 31 17:59:47 2022 +0800
./boot requires autoconf and automake
diff --git a/ghc9.4.spec b/ghc9.4.spec index e3f8b49..9a9e6b9 100644 --- a/ghc9.4.spec +++ b/ghc9.4.spec @@ -158,6 +158,7 @@ BuildRequires: llvm%{llvm_major} BuildRequires: llvm >= %{llvm_major} %endif %endif +BuildRequires: autoconf, automake %if %{with hadrian} BuildRequires: ghc-Cabal-static BuildRequires: ghc-QuickCheck-static @@ -174,14 +175,7 @@ BuildRequires: ghc-stm-static BuildRequires: ghc-transformers-static BuildRequires: ghc-unordered-containers-static BuildRequires: alex -BuildRequires: autoconf -BuildRequires: automake BuildRequires: happy -%else -%ifarch armv7hl -# patch12 -BuildRequires: autoconf, automake -%endif %endif Requires: %{name}-compiler = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} @@ -454,13 +448,6 @@ EOF %build autoupdate ./boot # --hadrian -# for patch12 -%ifarch armv7hl -autoreconf -%else -# alpha1 missing configure -autoconf -%endif
%ghc_set_gcc_flags export CC=%{_bindir}/gcc
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org