Skip to content
Snippets Groups Projects
Unverified Commit 6314590a authored by mergify[bot]'s avatar mergify[bot] Committed by GitHub
Browse files

Merge pull request #9391 from juhp/pkgconf-1.9

cabal-install-solver: fix pkgconf 1.9 --modversion regression
parents 609bc957 3832beaf
No related branches found
No related tags found
No related merge requests found
Pipeline #87007 passed
......@@ -67,11 +67,12 @@ readPkgConfigDb verbosity progdb = handle ioErrorHandler $ do
-- The output of @pkg-config --list-all@ also includes a description
-- for each package, which we do not need.
let pkgNames = map (takeWhile (not . isSpace)) pkgList
(pkgVersions, _errs, exitCode) <-
(outs, _errs, exitCode) <-
getProgramInvocationOutputAndErrors verbosity
(programInvocation pkgConfig ("--modversion" : pkgNames))
if exitCode == ExitSuccess && length pkgNames == length pkgList
then (return . pkgConfigDbFromList . zip pkgNames) (lines pkgVersions)
let pkgVersions = lines outs
if exitCode == ExitSuccess && length pkgVersions == length pkgNames
then (return . pkgConfigDbFromList . zip pkgNames) pkgVersions
else
-- if there's a single broken pc file the above fails, so we fall back
-- into calling it individually
......
synopsis: fix pkgconfig-depends for pkgconf-1.9
packages: cabal-install-solver
prs: #9391
issues: #8923
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment