Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backtrack when no pkgconfigdb is present #7621

Merged
merged 4 commits into from
Sep 10, 2021
Merged

Backtrack when no pkgconfigdb is present #7621

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52087ac
Backtrack when no pkgconfigdb is present
gbaz Sep 5, 2021
8d62bbe
changelog and test
gbaz Sep 9, 2021
73eb680
one more test
gbaz Sep 9, 2021
67eb7ac
Merge branch 'master' into gb/pkgconfig-backtrack
mergify[bot] Sep 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions cabal-install-solver/src/Distribution/Solver/Types/PkgConfigDb.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,12 @@ pkgConfigPkgIsPresent (PkgConfigDb db) pn vr =
Nothing -> False -- Package not present in the DB.
Just Nothing -> True -- Package present, but version unknown.
Just (Just v) -> withinPkgconfigVersionRange v vr
-- If we could not read the pkg-config database successfully we allow
-- the check to succeed. The plan found by the solver may fail to be
-- executed later on, but we have no grounds for rejecting the plan at
-- this stage.
pkgConfigPkgIsPresent NoPkgConfigDb _ _ = True
-- If we could not read the pkg-config database successfully we fail.
-- The plan found by the solver can't be executed later, because pkg-config itself
-- is going to be called in the build phase to get the library location for linking
-- so even if there is a library, it would need to be passed manual flags anyway.
pkgConfigPkgIsPresent NoPkgConfigDb _ _ = False



-- | Query the version of a package in the @pkg-config@ database.
Expand Down