Date: Sun, 04 Jan 2026 21:56:05 +0000 From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 15ae24cdb56c - main - lang/ghc9*: Remove files/UserSettings.hs which isn't used anymore Message-ID: <695ae1f5.aef9.2fe92deb@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=15ae24cdb56cbb48f8dcc78f9405f18dcd74664f commit 15ae24cdb56cbb48f8dcc78f9405f18dcd74664f Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2025-10-10 17:39:30 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2026-01-04 21:50:42 +0000 lang/ghc9*: Remove files/UserSettings.hs which isn't used anymore --- lang/ghc92/files/UserSettings.hs | 74 --------------------------------------- lang/ghc94/files/UserSettings.hs | 74 --------------------------------------- lang/ghc96/files/UserSettings.hs | 75 ---------------------------------------- 3 files changed, 223 deletions(-) diff --git a/lang/ghc92/files/UserSettings.hs b/lang/ghc92/files/UserSettings.hs deleted file mode 100644 index 9e622823d5d7..000000000000 --- a/lang/ghc92/files/UserSettings.hs +++ /dev/null @@ -1,74 +0,0 @@ --- Ensure we don't expose any unfoldings to guarantee quick rebuilds -{-# OPTIONS_GHC -O0 #-} - --- If you want to customise your build you should copy this file from --- hadrian/src/UserSettings.hs to hadrian/UserSettings.hs and edit your copy. --- If you don't copy the file your changes will be tracked by git and you can --- accidentally commit them. --- --- See doc/user-settings.md for instructions, and src/Flavour.hs for auxiliary --- functions for manipulating flavours. --- Please update doc/user-settings.md when committing changes to this file. -module UserSettings ( - userFlavours, userPackages, userDefaultFlavour, - verboseCommand, buildProgressColour, successColour, finalStage - ) where - -import Flavour -import Expression -import {-# SOURCE #-} Settings.Default - --- See doc/user-settings.md for instructions. --- Please update doc/user-settings.md when committing changes to this file. - --- | Name of the default flavour, i.e the one used when no --flavour=<name> --- argument is passed to Hadrian. -userDefaultFlavour :: String -userDefaultFlavour = "default" - --- | User-defined build flavours. See 'userFlavour' as an example. -userFlavours :: [Flavour] -userFlavours = [userFlavour] -- Add more build flavours if need be. - --- | This is an example user-defined build flavour. Feel free to modify it and --- use by passing @--flavour=user@ from the command line. -userFlavour :: Flavour -userFlavour = defaultFlavour { - name = "ports" - , libraryWays = remove ws defaultLibraryWays - , dynamicGhcPrograms = pure %%DYNAMIC%% --- , ghcProfiled = %%PROFILE%% - } - where - ws = concat [ - if %%DYNAMIC%% then [] else [dynamic] - , if %%PROFILE%% then [] else [profiling]] - --- | Add user-defined packages. Note, this only lets Hadrian know about the --- existence of a new package; to actually build it you need to create a new --- build flavour, modifying the list of packages that are built by default. -userPackages :: [Package] -userPackages = [] - --- | Set to 'True' to print full command lines during the build process. Note: --- this is a 'Predicate', hence you can enable verbose output only for certain --- targets, e.g.: @verboseCommand = package ghcPrim@. -verboseCommand :: Predicate -verboseCommand = do - verbosity <- expr getVerbosity - return $ verbosity >= Loud - --- | Set colour for build progress messages (e.g. executing a build command). -buildProgressColour :: BuildProgressColour -buildProgressColour = mkBuildProgressColour (Dull Magenta) - --- | Set colour for success messages (e.g. a package is built successfully). -successColour :: SuccessColour -successColour = mkSuccessColour (Dull Green) - --- | Stop after building the StageN compiler. --- For example, setting the 'finalStage' to 'Stage1' will just build the --- 'Stage1' compiler. Setting it to 'Stage3' will build the 'Stage3' --- compiler. Setting it to 'Stage0' will mean nothing gets built at all. -finalStage :: Stage -finalStage = Stage2 diff --git a/lang/ghc94/files/UserSettings.hs b/lang/ghc94/files/UserSettings.hs deleted file mode 100644 index 75b0b14e5cdb..000000000000 --- a/lang/ghc94/files/UserSettings.hs +++ /dev/null @@ -1,74 +0,0 @@ --- Ensure we don't expose any unfoldings to guarantee quick rebuilds -{-# OPTIONS_GHC -O0 #-} - --- If you want to customise your build you should copy this file from --- hadrian/src/UserSettings.hs to hadrian/UserSettings.hs and edit your copy. --- If you don't copy the file your changes will be tracked by git and you can --- accidentally commit them. --- --- See doc/user-settings.md for instructions, and src/Flavour.hs for auxiliary --- functions for manipulating flavours. --- Please update doc/user-settings.md when committing changes to this file. -module UserSettings ( - userFlavours, userPackages, userDefaultFlavour, - verboseCommand, buildProgressColour, successColour, finalStage - ) where - -import Flavour.Type -import Expression -import {-# SOURCE #-} Settings.Default - --- See doc/user-settings.md for instructions. --- Please update doc/user-settings.md when committing changes to this file. - --- | Name of the default flavour, i.e the one used when no --flavour=<name> --- argument is passed to Hadrian. -userDefaultFlavour :: String -userDefaultFlavour = "default" - --- | User-defined build flavours. See 'userFlavour' as an example. -userFlavours :: [Flavour] -userFlavours = [userFlavour] -- Add more build flavours if need be. - --- | This is an example user-defined build flavour. Feel free to modify it and --- use by passing @--flavour=user@ from the command line. -userFlavour :: Flavour -userFlavour = defaultFlavour { - name = "ports" - , libraryWays = remove ws defaultLibraryWays - , dynamicGhcPrograms = pure %%DYNAMIC%% --- , ghcProfiled = %%PROFILE%% - } - where - ws = concat [ - if %%DYNAMIC%% then [] else [dynamic] - , if %%PROFILE%% then [] else [profiling]] - --- | Add user-defined packages. Note, this only lets Hadrian know about the --- existence of a new package; to actually build it you need to create a new --- build flavour, modifying the list of packages that are built by default. -userPackages :: [Package] -userPackages = [] - --- | Set to 'True' to print full command lines during the build process. Note: --- this is a 'Predicate', hence you can enable verbose output only for certain --- targets, e.g.: @verboseCommand = package ghcPrim@. -verboseCommand :: Predicate -verboseCommand = do - verbosity <- expr getVerbosity - return $ verbosity >= Verbose - --- | Set colour for build progress messages (e.g. executing a build command). -buildProgressColour :: BuildProgressColour -buildProgressColour = mkBuildProgressColour (Dull Magenta) - --- | Set colour for success messages (e.g. a package is built successfully). -successColour :: SuccessColour -successColour = mkSuccessColour (Dull Green) - --- | Stop after building the StageN compiler. --- For example, setting the 'finalStage' to 'Stage1' will just build the --- 'Stage1' compiler. Setting it to 'Stage3' will build the 'Stage3' --- compiler. Setting it to 'Stage0' will mean nothing gets built at all. -finalStage :: Stage -finalStage = Stage2 diff --git a/lang/ghc96/files/UserSettings.hs b/lang/ghc96/files/UserSettings.hs deleted file mode 100644 index 01d8b0187f06..000000000000 --- a/lang/ghc96/files/UserSettings.hs +++ /dev/null @@ -1,75 +0,0 @@ --- Ensure we don't expose any unfoldings to guarantee quick rebuilds -{-# OPTIONS_GHC -O0 #-} - --- If you want to customise your build you should copy this file from --- hadrian/src/UserSettings.hs to hadrian/UserSettings.hs and edit your copy. --- If you don't copy the file your changes will be tracked by git and you can --- accidentally commit them. --- --- See doc/user-settings.md for instructions, and src/Flavour.hs for auxiliary --- functions for manipulating flavours. --- Please update doc/user-settings.md when committing changes to this file. -module UserSettings ( - userFlavours, userPackages, userDefaultFlavour, - verboseCommand, buildProgressColour, successColour, finalStage - ) where - -import qualified Data.Set as Set -import Flavour.Type -import Expression -import {-# SOURCE #-} Settings.Default - --- See doc/user-settings.md for instructions. --- Please update doc/user-settings.md when committing changes to this file. - --- | Name of the default flavour, i.e the one used when no --flavour=<name> --- argument is passed to Hadrian. -userDefaultFlavour :: String -userDefaultFlavour = "default" - --- | User-defined build flavours. See 'userFlavour' as an example. -userFlavours :: [Flavour] -userFlavours = [userFlavour] -- Add more build flavours if need be. - --- | This is an example user-defined build flavour. Feel free to modify it and --- use by passing @--flavour=user@ from the command line. -userFlavour :: Flavour -userFlavour = defaultFlavour { - name = "ports" - , libraryWays = Set.difference <$> defaultLibraryWays <*> pure ws - , dynamicGhcPrograms = pure %%DYNAMIC%% --- , ghcProfiled = %%PROFILE%% - } - where - ws = Set.fromList $ concat [ - if %%DYNAMIC%% then [] else [dynamic] - , if %%PROFILE%% then [] else [profiling]] - --- | Add user-defined packages. Note, this only lets Hadrian know about the --- existence of a new package; to actually build it you need to create a new --- build flavour, modifying the list of packages that are built by default. -userPackages :: [Package] -userPackages = [] - --- | Set to 'True' to print full command lines during the build process. Note: --- this is a 'Predicate', hence you can enable verbose output only for certain --- targets, e.g.: @verboseCommand = package ghcPrim@. -verboseCommand :: Predicate -verboseCommand = do - verbosity <- expr getVerbosity - return $ verbosity >= Verbose - --- | Set colour for build progress messages (e.g. executing a build command). -buildProgressColour :: BuildProgressColour -buildProgressColour = mkBuildProgressColour (Dull Magenta) - --- | Set colour for success messages (e.g. a package is built successfully). -successColour :: SuccessColour -successColour = mkSuccessColour (Dull Green) - --- | Stop after building the StageN compiler. --- For example, setting the 'finalStage' to 'Stage1' will just build the --- 'Stage1' compiler. Setting it to 'Stage3' will build the 'Stage3' --- compiler. Setting it to 'Stage0' will mean nothing gets built at all. -finalStage :: Stage -finalStage = Stage2home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?695ae1f5.aef9.2fe92deb>