mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
40e44a5411
Signed-off-by: hololeap <hololeap@protonmail.com> Signed-off-by: Mark Wright <gienah@gentoo.org>
71 lines
3.2 KiB
Diff
71 lines
3.2 KiB
Diff
From 559952c5907d5aa4787907c558f579937d9d7eaf Mon Sep 17 00:00:00 2001
|
|
From: hololeap <hololeap@protonmail.com>
|
|
Date: Fri, 25 Apr 2025 15:08:09 -0600
|
|
Subject: [PATCH 1/1] Add hadrian file-io support
|
|
|
|
Newer 'directory' requires 'file-io'; hadrian needs to be instructed to
|
|
build it. Lines were swiped from the 'ghc-9.12.2-release' branch of ghc.
|
|
|
|
Signed-off-by: hololeap <hololeap@protonmail.com>
|
|
--- a/src/Packages.hs
|
|
+++ b/src/Packages.hs
|
|
@@ -4,7 +4,7 @@ module Packages (
|
|
array, base, binary, bytestring, cabal, cabalSyntax, checkPpr,
|
|
checkExact, countDeps,
|
|
compareSizes, compiler, containers, deepseq, deriveConstants, directory,
|
|
- exceptions, filepath, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh,
|
|
+ exceptions, filepath, fileio, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh,
|
|
ghcCompact, ghcConfig, ghcHeap, ghci, ghciWrapper, ghcPkg, ghcPrim, haddock, haskeline,
|
|
hsc2hs, hp2ps, hpc, hpcBin, integerGmp, integerSimple, iserv, iservProxy,
|
|
libffi, mtl, parsec, pretty, primitive, process, remoteIserv, rts,
|
|
@@ -40,7 +40,7 @@ ghcPackages =
|
|
, ghcCompact, ghcConfig, ghcHeap, ghci, ghciWrapper, ghcPkg, ghcPrim, haddock, haskeline, hsc2hs
|
|
, hp2ps, hpc, hpcBin, integerGmp, integerSimple, iserv, libffi, mtl
|
|
, parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell
|
|
- , terminfo, text, time, touchy, transformers, unlit, unix, win32, xhtml
|
|
+ , terminfo, text, time, touchy, transformers, unlit, unix, win32, xhtml, fileio
|
|
, timeout
|
|
, lintersCommon
|
|
, lintNotes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace ]
|
|
@@ -77,6 +77,7 @@ deriveConstants = util "deriveConstants"
|
|
directory = lib "directory"
|
|
exceptions = lib "exceptions"
|
|
filepath = lib "filepath"
|
|
+fileio = lib "file-io"
|
|
genapply = util "genapply"
|
|
genprimopcode = util "genprimopcode"
|
|
ghc = prg "ghc-bin" `setPath` "ghc"
|
|
--- a/src/Rules/ToolArgs.hs
|
|
+++ b/src/Rules/ToolArgs.hs
|
|
@@ -155,6 +155,7 @@ toolTargets = [ binary
|
|
, process
|
|
, exceptions
|
|
, filepath
|
|
+ , fileio
|
|
-- , ghc -- # depends on ghc library
|
|
-- , runGhc -- # depends on ghc library
|
|
, ghcBoot
|
|
--- a/src/Settings/Default.hs
|
|
+++ b/src/Settings/Default.hs
|
|
@@ -82,6 +82,7 @@ stage0Packages = do
|
|
, process
|
|
, exceptions
|
|
, filepath
|
|
+ , fileio
|
|
, ghc
|
|
, runGhc
|
|
, ghcBoot
|
|
--- a/src/Settings/Warnings.hs
|
|
+++ b/src/Settings/Warnings.hs
|
|
@@ -39,6 +39,7 @@ ghcWarningsArgs = do
|
|
, package directory ? pure [ "-Wno-unused-imports"
|
|
, "-Wno-deprecations" -- https://gitlab.haskell.org/ghc/ghc/-/issues/24240
|
|
]
|
|
+ , package fileio ? pure [ "-Wno-unused-imports" ] -- https://github.com/haskell/file-io/issues/30
|
|
, package filepath ? pure [ "-fno-warn-unused-imports" ]
|
|
, package ghc ? pure [ "-Wcpp-undef"
|
|
, "-Wincomplete-uni-patterns"
|
|
--
|
|
2.49.0
|
|
|