From nobody Sun Jan 4 21:56:05 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dkrpy5H69z6MwM3 for ; Sun, 04 Jan 2026 21:56:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dkrpy1yb3z3LwN for ; Sun, 04 Jan 2026 21:56:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767563770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dbWbBikjm3Zaih6yQ0XDobLZxyf7UvXFmgBRE7ORtcg=; b=c9vJkDUHruJ7WYtAAyaw/TGNkW+aPmCXeAZ8nNhpGeDu+8eFDV8+Z2hqDqug6rfe/yqUr/ /SyCTVq1lFLhrjIeK3AqYmOEhBLeZsIRL5FIdZBeBnTDSpdh4tSXFL8Zt3urbiP0RG3KPa EtHDutXtMEsAi/JRilDpW9eWVhkeZYSVXR4t+nWMIAUDx12SwqLRnPgmWZCPNUQcXrvfgI p+4UAg6M3g5DeI9IOHgWAMIo9zIgmT6oOEE6QRG+5dxQrMih+d8ylryxfxm08OuBqM1/GR t8tMlnfgnkO619I8lnWq79YvIk4/+IZVMP6wrQFHfzlMmOROqGTcmMvainQtjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767563770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dbWbBikjm3Zaih6yQ0XDobLZxyf7UvXFmgBRE7ORtcg=; b=rXSBUD7TOZN6nideo4bFyPjSH4g5c6MhxZ36iN7SIMHmNn8OitqDr0q3Y8VKt6JVRukSrq Y+0KkPbOua4MJ8HeWEMpLVYRJXvd5FIbSWnZc1KE+IxPBwAsgf0/pJpKlUO16662yHboP0 KdjI0p/t+VeWnHlDwM5FpEMrTqCyBdlfXDLcFfnvkb2a6o6SxZODU0tcAzh8wVFFnQWYOI Oe+9L1kMewqkMbXUfrRJ4ls1MPZnZeaOVR6ugXH6Ikb7xm9p9+0Dtnkiz0iqfX9p8ksbwS M7GwOuiu9Z/zxnITdikxJbauMblwR/2ibrhmh9wnJUVie1rwR07FGu5VnQRvmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767563770; a=rsa-sha256; cv=none; b=o1gvKgStatl7cr3EfC1h/wNFdbStpMZsOXn8EVuRcPRrsi8RHmjUZSBmNl363v91yeOvvC 65c7B94ViUIbFMr/kb6cqVmUf68ihDZMqePBnkGYfxNph4cLfGPbA/nUa79rO/ecS9PCYt RGINZV4puAY9DjWgJ62j7MZMU+3d5RTH1U/nTLiT12peK8w1T8Iam1dCwklEDJlUfAJgA+ 01OxPNbab3+a7/e1MrFePOjjGPO9QrmfPEKnosG87qpTc1zvax2qtRNauhfydA3rReH+XB oPtT7PSsbmak2CVtmKFdl6bZSPZzTsXAHjZB9KJ7OeJAZVIXKtTLSASagEaWUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dkrpy1MmzzsM0 for ; Sun, 04 Jan 2026 21:56:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id aef9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 04 Jan 2026 21:56:05 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 15ae24cdb56c - main - lang/ghc9*: Remove files/UserSettings.hs which isn't used anymore List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15ae24cdb56cbb48f8dcc78f9405f18dcd74664f Auto-Submitted: auto-generated Date: Sun, 04 Jan 2026 21:56:05 +0000 Message-Id: <695ae1f5.aef9.2fe92deb@gitrepo.freebsd.org> The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=15ae24cdb56cbb48f8dcc78f9405f18dcd74664f commit 15ae24cdb56cbb48f8dcc78f9405f18dcd74664f Author: Gleb Popov AuthorDate: 2025-10-10 17:39:30 +0000 Commit: Gleb Popov 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= --- 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= --- 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= --- 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 = Stage2