diff --git a/cabal-install/src/Distribution/Client/ProjectConfig.hs b/cabal-install/src/Distribution/Client/ProjectConfig.hs index 3083f9777bf..af47c65374e 100644 --- a/cabal-install/src/Distribution/Client/ProjectConfig.hs +++ b/cabal-install/src/Distribution/Client/ProjectConfig.hs @@ -50,6 +50,7 @@ module Distribution.Client.ProjectConfig , resolveSolverSettings , BuildTimeSettings (..) , resolveBuildTimeSettings + , resolveProgramDb -- * Checking configuration , checkBadPerPackageCompilerPaths @@ -154,6 +155,14 @@ import Distribution.Simple.InstallDirs ) import Distribution.Simple.Program ( ConfiguredProgram (..) + , ProgramSearchPathEntry (..) + ) +import Distribution.Simple.Program.Db + ( ProgramDb + , defaultProgramDb + , modifyProgramSearchPath + , userSpecifyArgss + , userSpecifyPaths ) import Distribution.Simple.Setup ( Flag (Flag) @@ -496,6 +505,19 @@ resolveBuildTimeSettings | isParallelBuild buildSettingNumJobs = False | otherwise = False +-- | ProgramDb with directly user specified paths +resolveProgramDb :: ProjectConfig -> ProgramDb +resolveProgramDb ProjectConfig{projectConfigLocalPackages = PackageConfig{..}} = + userSpecifyPaths (Map.toList (getMapLast packageConfigProgramPaths)) + . userSpecifyArgss (Map.toList (getMapMappend packageConfigProgramArgs)) + . modifyProgramSearchPath + ( ++ + [ ProgramSearchPathDir dir + | dir <- fromNubList packageConfigProgramPathExtra + ] + ) + $ defaultProgramDb + --------------------------------------------- -- Reading and writing project config files -- diff --git a/cabal-install/src/Distribution/Client/ProjectPlanning.hs b/cabal-install/src/Distribution/Client/ProjectPlanning.hs index 3cb0d8033e8..3a8df142a19 100644 --- a/cabal-install/src/Distribution/Client/ProjectPlanning.hs +++ b/cabal-install/src/Distribution/Client/ProjectPlanning.hs @@ -481,7 +481,7 @@ configureCompiler DistDirLayout { distProjectCacheFile } - ProjectConfig + projectConfig@ProjectConfig { projectConfigShared = ProjectConfigShared { projectConfigHcFlavor @@ -531,15 +531,7 @@ configureCompiler hcFlavor = flagToMaybe projectConfigHcFlavor hcPath = flagToMaybe projectConfigHcPath hcPkg = flagToMaybe projectConfigHcPkg - progdb = - userSpecifyPaths (Map.toList (getMapLast packageConfigProgramPaths)) - . modifyProgramSearchPath - ( [ ProgramSearchPathDir dir - | dir <- fromNubList packageConfigProgramPathExtra - ] - ++ - ) - $ defaultProgramDb + progdb = resolveProgramDb projectConfig ------------------------------------------------------------------------------ @@ -588,6 +580,9 @@ rebuildInstallPlan progsearchpath <- liftIO $ getSystemSearchPath let projectConfigMonitored = projectConfig{projectConfigBuildOnly = mempty} + let progdb = resolveProgramDb projectConfig + pkgConfigDB <- getPkgConfigDb verbosity distDirLayout progdb + -- The overall improved plan is cached rerunIfChanged verbosity @@ -607,11 +602,12 @@ rebuildInstallPlan ) $ do compilerEtc <- phaseConfigureCompiler projectConfig - _ <- phaseConfigurePrograms projectConfig compilerEtc - (solverPlan, pkgConfigDB, totalIndexState, activeRepos) <- + + (solverPlan, totalIndexState, activeRepos) <- phaseRunSolver projectConfig compilerEtc + pkgConfigDB localPackages (fromMaybe mempty mbInstalledPackages) ( elaboratedPlan @@ -650,39 +646,19 @@ rebuildInstallPlan phaseConfigureCompiler :: ProjectConfig -> Rebuild (Compiler, Platform, ProgramDb) - phaseConfigureCompiler = configureCompiler verbosity distDirLayout + phaseConfigureCompiler projectConfig = do + (compiler, platform, progdb) <- configureCompiler verbosity distDirLayout projectConfig - -- Configuring other programs. - -- - -- Having configred the compiler, now we configure all the remaining - -- programs. This is to check we can find them, and to monitor them for - -- changes. - -- - -- TODO: [required eventually] we don't actually do this yet. - -- - -- We rely on the fact that the previous phase added the program config for - -- all local packages, but that all the programs configured so far are the - -- compiler program or related util programs. - -- - phaseConfigurePrograms - :: ProjectConfig - -> (Compiler, Platform, ProgramDb) - -> Rebuild () - phaseConfigurePrograms projectConfig (_, _, compilerprogdb) = do -- Users are allowed to specify program locations independently for -- each package (e.g. to use a particular version of a pre-processor -- for some packages). However they cannot do this for the compiler -- itself as that's just not going to work. So we check for this. liftIO $ checkBadPerPackageCompilerPaths - (configuredPrograms compilerprogdb) + (configuredPrograms progdb) (getMapMappend (projectConfigSpecificPackage projectConfig)) - -- TODO: [required eventually] find/configure other programs that the - -- user specifies. - - -- TODO: [required eventually] find/configure all build-tools - -- but note that some of them may be built as part of the plan. + return (compiler, platform, progdb) -- Run the solver to get the initial install plan. -- This is expensive so we cache it independently. @@ -690,15 +666,17 @@ rebuildInstallPlan phaseRunSolver :: ProjectConfig -> (Compiler, Platform, ProgramDb) + -> PkgConfigDb -> [PackageSpecifier UnresolvedSourcePackage] -> InstalledPackageIndex - -> Rebuild (SolverInstallPlan, PkgConfigDb, IndexUtils.TotalIndexState, IndexUtils.ActiveRepos) + -> Rebuild (SolverInstallPlan, IndexUtils.TotalIndexState, IndexUtils.ActiveRepos) phaseRunSolver projectConfig@ProjectConfig { projectConfigShared , projectConfigBuildOnly } (compiler, platform, progdb) + pkgConfigDB localPackages installedPackages = rerunIfChanged @@ -719,13 +697,13 @@ rebuildInstallPlan progdb platform corePackageDbs + (sourcePkgDb, tis, ar) <- getSourcePackages verbosity withRepoCtx (solverSettingIndexState solverSettings) (solverSettingActiveRepos solverSettings) - pkgConfigDB <- getPkgConfigDb verbosity progdb -- TODO: [code cleanup] it'd be better if the Compiler contained the -- ConfiguredPrograms that it needs, rather than relying on the progdb @@ -750,7 +728,7 @@ rebuildInstallPlan Left msg -> do reportPlanningFailure projectConfig compiler platform localPackages dieWithException verbosity $ PhaseRunSolverErr msg - Right plan -> return (plan, pkgConfigDB, tis, ar) + Right plan -> return (plan, tis, ar) where corePackageDbs :: [PackageDB] corePackageDbs = @@ -1036,13 +1014,21 @@ getSourcePackages verbosity withRepoCtx idxState activeRepos = do $ repos return sourcePkgDbWithTIS -getPkgConfigDb :: Verbosity -> ProgramDb -> Rebuild PkgConfigDb -getPkgConfigDb verbosity progdb = do +getPkgConfigDb :: Verbosity -> DistDirLayout -> ProgramDb -> Rebuild PkgConfigDb +getPkgConfigDb verbosity distDirLayout progdb = do + -- We find the pkg-config program and we ask it for the location of the pc files. + -- We then use these two values for the cache key + mpkgConfig <- liftIO $ needProgram verbosity pkgConfigProgram progdb + let mpkgConfigLoc = fst <$> mpkgConfig dirs <- liftIO $ getPkgConfigDbDirs verbosity progdb - -- Just monitor the dirs so we'll notice new .pc files. - -- Alternatively we could monitor all the .pc files too. - traverse_ monitorDirectoryStatus dirs - liftIO $ readPkgConfigDb verbosity progdb + rerunIfChanged verbosity fileMonitorPkgConfigDb (mpkgConfigLoc, dirs) $ do + liftIO $ notice verbosity "Querying pkg-config database..." + -- Just monitor the dirs so we'll notice new .pc files. + -- Alternatively we could monitor all the .pc files too. + traverse_ monitorDirectoryStatus dirs + liftIO $ readPkgConfigDb verbosity progdb + where + fileMonitorPkgConfigDb = newFileMonitor $ distProjectCacheFile distDirLayout "pkg-config-db" -- | Select the config values to monitor for changes package source hashes. packageLocationsSignature diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external-target.out b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external-target.out index ff8d8b3f518..55477c8321f 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external-target.out +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external-target.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external.out b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external.out index 1c42b18b90a..2fabfe9698d 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external.out +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal-target.out b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal-target.out index 8b63d59d82c..2546643a96c 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal-target.out +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal-target.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.out b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.out index f8dfb64d9e6..b5ada7b74ba 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.out +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.out b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.out index 6e2abbf4a0c..f1bd4a0e659 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.out +++ b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.out b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.out index 88b36e02c50..317f2dea72f 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.out +++ b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: @@ -18,8 +19,7 @@ Configuring library 'indef' instantiated with Data.Map = containers-:Data.Map for Includes3-0.1.0.0... Preprocessing library 'indef' for Includes3-0.1.0.0... -Building library 'indef' instantiated with - Data.Map = containers-:Data.Map +Building library 'indef' instantiated with Data.Map = containers-:Data.Map for Includes3-0.1.0.0... Configuring executable 'exe' for Includes3-0.1.0.0... Preprocessing executable 'exe' for Includes3-0.1.0.0... diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-repo.out b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-repo.out index d6fb3844873..f08d33942ab 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-repo.out +++ b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-repo.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Backpack/Reexport2/cabal.out b/cabal-testsuite/PackageTests/Backpack/Reexport2/cabal.out index 31c9428dcaf..8e698017a9a 100644 --- a/cabal-testsuite/PackageTests/Backpack/Reexport2/cabal.out +++ b/cabal-testsuite/PackageTests/Backpack/Reexport2/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Error: Problem with module re-exports: diff --git a/cabal-testsuite/PackageTests/Backpack/T6385/cabal.out b/cabal-testsuite/PackageTests/Backpack/T6385/cabal.out index ad3387bf28b..f90f07e8237 100644 --- a/cabal-testsuite/PackageTests/Backpack/T6385/cabal.out +++ b/cabal-testsuite/PackageTests/Backpack/T6385/cabal.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Backpack/bkpcabal01/cabal.out b/cabal-testsuite/PackageTests/Backpack/bkpcabal01/cabal.out index 4630087ccc2..bb46945ebc9 100644 --- a/cabal-testsuite/PackageTests/Backpack/bkpcabal01/cabal.out +++ b/cabal-testsuite/PackageTests/Backpack/bkpcabal01/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/BuildDeps/DepCycle/cabal.out b/cabal-testsuite/PackageTests/BuildDeps/DepCycle/cabal.out index 966c934480b..6da906cfc44 100644 --- a/cabal-testsuite/PackageTests/BuildDeps/DepCycle/cabal.out +++ b/cabal-testsuite/PackageTests/BuildDeps/DepCycle/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Error: Dependency cycle between the following components: diff --git a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out index f00101f9ba2..f4502a5c3cc 100644 --- a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out +++ b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out index a1636d8cbff..c2e56577929 100644 --- a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out +++ b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out index 482ff118031..2493deb0c24 100644 --- a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out +++ b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-build +Querying pkg-config database... Resolving dependencies... Error: [Cabal-7107] Could not resolve dependencies: diff --git a/cabal-testsuite/PackageTests/BuildToolDepends/setup.out b/cabal-testsuite/PackageTests/BuildToolDepends/setup.out index 9a873303de8..a96019bc5f6 100644 --- a/cabal-testsuite/PackageTests/BuildToolDepends/setup.out +++ b/cabal-testsuite/PackageTests/BuildToolDepends/setup.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/BuildTools/External/cabal.out b/cabal-testsuite/PackageTests/BuildTools/External/cabal.out index b61bf0f1886..d96a855dec1 100644 --- a/cabal-testsuite/PackageTests/BuildTools/External/cabal.out +++ b/cabal-testsuite/PackageTests/BuildTools/External/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out b/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out index 37cab90e663..65c0b069d79 100644 --- a/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out +++ b/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/CmmSources/cabal.out b/cabal-testsuite/PackageTests/CmmSources/cabal.out index 1664b64c7fc..c49391d6a55 100644 --- a/cabal-testsuite/PackageTests/CmmSources/cabal.out +++ b/cabal-testsuite/PackageTests/CmmSources/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/CmmSourcesDyn/cabal.out b/cabal-testsuite/PackageTests/CmmSourcesDyn/cabal.out index 1664b64c7fc..c49391d6a55 100644 --- a/cabal-testsuite/PackageTests/CmmSourcesDyn/cabal.out +++ b/cabal-testsuite/PackageTests/CmmSourcesDyn/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/CmmSourcesExe/cabal.out b/cabal-testsuite/PackageTests/CmmSourcesExe/cabal.out index 77b94906515..07c65f4be62 100644 --- a/cabal-testsuite/PackageTests/CmmSourcesExe/cabal.out +++ b/cabal-testsuite/PackageTests/CmmSourcesExe/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out b/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out index c6dbf79d5d5..e8b888ecd35 100644 --- a/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out +++ b/cabal-testsuite/PackageTests/ConditionalAndImport/cabal.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ConfigFile/T8487/cabal.out b/cabal-testsuite/PackageTests/ConfigFile/T8487/cabal.out index bf17f93ac6c..9d90e1c9399 100644 --- a/cabal-testsuite/PackageTests/ConfigFile/T8487/cabal.out +++ b/cabal-testsuite/PackageTests/ConfigFile/T8487/cabal.out @@ -1,4 +1,5 @@ # cabal build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O2 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Configure/cabal.out b/cabal-testsuite/PackageTests/Configure/cabal.out index 79a33e68892..c05dcd899b4 100644 --- a/cabal-testsuite/PackageTests/Configure/cabal.out +++ b/cabal-testsuite/PackageTests/Configure/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/CopyHie/cabal.out b/cabal-testsuite/PackageTests/CopyHie/cabal.out index a45daf37831..4306b30b265 100644 --- a/cabal-testsuite/PackageTests/CopyHie/cabal.out +++ b/cabal-testsuite/PackageTests/CopyHie/cabal.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/CustomSegfault/cabal.out b/cabal-testsuite/PackageTests/CustomSegfault/cabal.out index 80f27e69b58..37e378cd0b9 100644 --- a/cabal-testsuite/PackageTests/CustomSegfault/cabal.out +++ b/cabal-testsuite/PackageTests/CustomSegfault/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out b/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out index 74d7f6adf31..f94c37caf68 100644 --- a/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out +++ b/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out b/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out index 0e26184375c..5253ecf1592 100644 --- a/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out +++ b/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Exec/cabal.out b/cabal-testsuite/PackageTests/Exec/cabal.out index 7ce2cfb90f0..aa6ae077f66 100644 --- a/cabal-testsuite/PackageTests/Exec/cabal.out +++ b/cabal-testsuite/PackageTests/Exec/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ExecModern/cabal.out b/cabal-testsuite/PackageTests/ExecModern/cabal.out index fc4e1b601b3..6ebe9ae7910 100644 --- a/cabal-testsuite/PackageTests/ExecModern/cabal.out +++ b/cabal-testsuite/PackageTests/ExecModern/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ExtraPackages/cabal.out b/cabal-testsuite/PackageTests/ExtraPackages/cabal.out index 95c356b73f6..ddf9700dc53 100644 --- a/cabal-testsuite/PackageTests/ExtraPackages/cabal.out +++ b/cabal-testsuite/PackageTests/ExtraPackages/cabal.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ExtraProgPath/setup.out b/cabal-testsuite/PackageTests/ExtraProgPath/setup.out index ea86cfd0f9d..26c7b7e6cc4 100644 --- a/cabal-testsuite/PackageTests/ExtraProgPath/setup.out +++ b/cabal-testsuite/PackageTests/ExtraProgPath/setup.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Warning: cannot determine version of /./pkg-config : "" Warning: cannot determine version of /./pkg-config : diff --git a/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.out b/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.out index 97e0b60ec7c..5cf6dfc83e1 100644 --- a/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.out +++ b/cabal-testsuite/PackageTests/FFI/ForeignOptsC/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.out b/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.out index 522304298c4..9a29bc57b95 100644 --- a/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.out +++ b/cabal-testsuite/PackageTests/FFI/ForeignOptsCxx/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/HaddockArgs/hoogle.out b/cabal-testsuite/PackageTests/HaddockArgs/hoogle.out index b67d57515dd..30def6d2ed3 100644 --- a/cabal-testsuite/PackageTests/HaddockArgs/hoogle.out +++ b/cabal-testsuite/PackageTests/HaddockArgs/hoogle.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/HaddockArgs/quickjump.out b/cabal-testsuite/PackageTests/HaddockArgs/quickjump.out index 52809bcc3af..043a008b2ef 100644 --- a/cabal-testsuite/PackageTests/HaddockArgs/quickjump.out +++ b/cabal-testsuite/PackageTests/HaddockArgs/quickjump.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/HaddockProject/haddock-project.out b/cabal-testsuite/PackageTests/HaddockProject/haddock-project.out index a2f14d6a6f2..a6a8e106531 100644 --- a/cabal-testsuite/PackageTests/HaddockProject/haddock-project.out +++ b/cabal-testsuite/PackageTests/HaddockProject/haddock-project.out @@ -2,6 +2,7 @@ Downloading the latest package list from test-local-repo # cabal haddock-project Warning: haddock-project command is experimental, it might break in the future +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/HaddockWarn/cabal.out b/cabal-testsuite/PackageTests/HaddockWarn/cabal.out index fae3d5423de..cd4f8434eb5 100644 --- a/cabal-testsuite/PackageTests/HaddockWarn/cabal.out +++ b/cabal-testsuite/PackageTests/HaddockWarn/cabal.out @@ -1,3 +1,4 @@ # cabal v2-haddock +Querying pkg-config database... Resolving dependencies... -No documentation was generated as this package does not contain a library. Perhaps you want to use the --haddock-all flag, or one or more of the --haddock-executables, --haddock-tests, --haddock-benchmarks or --haddock-internal flags. \ No newline at end of file +No documentation was generated as this package does not contain a library. Perhaps you want to use the --haddock-all flag, or one or more of the --haddock-executables, --haddock-tests, --haddock-benchmarks or --haddock-internal flags. diff --git a/cabal-testsuite/PackageTests/InternalLibraries/cabal-per-package.out b/cabal-testsuite/PackageTests/InternalLibraries/cabal-per-package.out index 72a24d04059..1d5f284aed5 100644 --- a/cabal-testsuite/PackageTests/InternalLibraries/cabal-per-package.out +++ b/cabal-testsuite/PackageTests/InternalLibraries/cabal-per-package.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Error: Internal libraries only supported with per-component builds. diff --git a/cabal-testsuite/PackageTests/InternalLibraries/cabal.out b/cabal-testsuite/PackageTests/InternalLibraries/cabal.out index fba3d64f472..c493e4b2eb4 100644 --- a/cabal-testsuite/PackageTests/InternalLibraries/cabal.out +++ b/cabal-testsuite/PackageTests/InternalLibraries/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/JS/JsSources/other-arch.out b/cabal-testsuite/PackageTests/JS/JsSources/other-arch.out index a07cc17dd35..a03b060dbc2 100644 --- a/cabal-testsuite/PackageTests/JS/JsSources/other-arch.out +++ b/cabal-testsuite/PackageTests/JS/JsSources/other-arch.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/JS/JsSourcesExe/other-arch.out b/cabal-testsuite/PackageTests/JS/JsSourcesExe/other-arch.out index 96e1bbadcf9..87d224a5c03 100644 --- a/cabal-testsuite/PackageTests/JS/JsSourcesExe/other-arch.out +++ b/cabal-testsuite/PackageTests/JS/JsSourcesExe/other-arch.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ListBin/Script/cabal.out b/cabal-testsuite/PackageTests/ListBin/Script/cabal.out index 63d1cab2c01..60ca99ddbdd 100644 --- a/cabal-testsuite/PackageTests/ListBin/Script/cabal.out +++ b/cabal-testsuite/PackageTests/ListBin/Script/cabal.out @@ -1,4 +1,5 @@ # cabal list-bin +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ListBin/SelectedComponent/cabal.out b/cabal-testsuite/PackageTests/ListBin/SelectedComponent/cabal.out index 3728cc3e70e..db900422af6 100644 --- a/cabal-testsuite/PackageTests/ListBin/SelectedComponent/cabal.out +++ b/cabal-testsuite/PackageTests/ListBin/SelectedComponent/cabal.out @@ -1,4 +1,5 @@ # cabal list-bin +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/MonitorPkgConfig/P.hs b/cabal-testsuite/PackageTests/MonitorPkgConfig/P.hs new file mode 100644 index 00000000000..fc4877ad85e --- /dev/null +++ b/cabal-testsuite/PackageTests/MonitorPkgConfig/P.hs @@ -0,0 +1 @@ +module P where diff --git a/cabal-testsuite/PackageTests/MonitorPkgConfig/cabal.out b/cabal-testsuite/PackageTests/MonitorPkgConfig/cabal.out new file mode 100644 index 00000000000..461da161f5c --- /dev/null +++ b/cabal-testsuite/PackageTests/MonitorPkgConfig/cabal.out @@ -0,0 +1,6 @@ +# cabal v2-build +# cabal v2-build +# cabal v2-build +# cabal v2-build +# cabal v2-build +# cabal v2-build diff --git a/cabal-testsuite/PackageTests/MonitorPkgConfig/cabal.project b/cabal-testsuite/PackageTests/MonitorPkgConfig/cabal.project new file mode 100644 index 00000000000..e6fdbadb439 --- /dev/null +++ b/cabal-testsuite/PackageTests/MonitorPkgConfig/cabal.project @@ -0,0 +1 @@ +packages: . diff --git a/cabal-testsuite/PackageTests/MonitorPkgConfig/cabal.test.hs b/cabal-testsuite/PackageTests/MonitorPkgConfig/cabal.test.hs new file mode 100644 index 00000000000..132e3eb9a28 --- /dev/null +++ b/cabal-testsuite/PackageTests/MonitorPkgConfig/cabal.test.hs @@ -0,0 +1,35 @@ +import Distribution.Compat.Environment (setEnv) +import System.Directory (copyFile, createDirectoryIfMissing, removeDirectoryRecursive) +import Test.Cabal.Prelude + +main = cabalTest $ do + env <- getTestEnv + + cabal' "v2-build" ["--dry-run", "p", "-v1"] + >>= assertOutputContains "Querying pkg-config database..." + + cabal' "v2-build" ["--dry-run", "p", "-v1"] + >>= assertOutputDoesNotContain "Querying pkg-config database..." + + -- Check that changing PKG_CONFIG_PATH invalidates the cache + + let pkgConfigPath = testWorkDir env "pkgconfig" + liftIO $ do + createDirectoryIfMissing True pkgConfigPath + setEnv "PKG_CONFIG_PATH" pkgConfigPath + + cabal' "v2-build" ["--dry-run", "p", "-v1"] + >>= assertOutputContains "Querying pkg-config database..." + + cabal' "v2-build" ["--dry-run", "p", "-v1"] + >>= assertOutputDoesNotContain "Querying pkg-config database..." + + -- Check that changing a file in PKG_CONFIG_PATH invalidates the cache + + liftIO $ copyFile (testCurrentDir env "test.pc") (pkgConfigPath "test.pc") + + cabal' "v2-build" ["--dry-run", "p", "-v1"] + >>= assertOutputContains "Querying pkg-config database..." + + cabal' "v2-build" ["--dry-run", "p", "-v1"] + >>= assertOutputDoesNotContain "Querying pkg-config database..." diff --git a/cabal-testsuite/PackageTests/MonitorPkgConfig/p.cabal b/cabal-testsuite/PackageTests/MonitorPkgConfig/p.cabal new file mode 100644 index 00000000000..47764c2d8a4 --- /dev/null +++ b/cabal-testsuite/PackageTests/MonitorPkgConfig/p.cabal @@ -0,0 +1,12 @@ +name: p +version: 1.0 +license: BSD3 +author: Somebody +maintainer: some@email.address +build-type: Simple +cabal-version: >=1.10 + +library + exposed-modules: P + build-depends: base + default-language: Haskell2010 diff --git a/cabal-testsuite/PackageTests/MonitorPkgConfig/test.pc b/cabal-testsuite/PackageTests/MonitorPkgConfig/test.pc new file mode 100644 index 00000000000..351ba425ea1 --- /dev/null +++ b/cabal-testsuite/PackageTests/MonitorPkgConfig/test.pc @@ -0,0 +1,3 @@ +Name: test +Version: 0 +Description: a test .pc file diff --git a/cabal-testsuite/PackageTests/MultiRepl/CabalTooOld/cabal.out b/cabal-testsuite/PackageTests/MultiRepl/CabalTooOld/cabal.out index f2253c67190..66a33c3767b 100644 --- a/cabal-testsuite/PackageTests/MultiRepl/CabalTooOld/cabal.out +++ b/cabal-testsuite/PackageTests/MultiRepl/CabalTooOld/cabal.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-repl +Querying pkg-config database... Resolving dependencies... Error: [Cabal-7107] Could not resolve dependencies: diff --git a/cabal-testsuite/PackageTests/MultiRepl/EnabledClosure/cabal.out b/cabal-testsuite/PackageTests/MultiRepl/EnabledClosure/cabal.out index 8944a7dba34..60ce359e8df 100644 --- a/cabal-testsuite/PackageTests/MultiRepl/EnabledClosure/cabal.out +++ b/cabal-testsuite/PackageTests/MultiRepl/EnabledClosure/cabal.out @@ -1,4 +1,5 @@ # cabal v2-repl +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/MultiRepl/EnabledSucc/cabal.out b/cabal-testsuite/PackageTests/MultiRepl/EnabledSucc/cabal.out index 6571793245e..9f2e0dc30b1 100644 --- a/cabal-testsuite/PackageTests/MultiRepl/EnabledSucc/cabal.out +++ b/cabal-testsuite/PackageTests/MultiRepl/EnabledSucc/cabal.out @@ -1,4 +1,5 @@ # cabal v2-repl +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/MultiRepl/NotEnabledFail/cabal.multirepl-a.out b/cabal-testsuite/PackageTests/MultiRepl/NotEnabledFail/cabal.multirepl-a.out index 3b38560a7d4..b6388bd2f67 100644 --- a/cabal-testsuite/PackageTests/MultiRepl/NotEnabledFail/cabal.multirepl-a.out +++ b/cabal-testsuite/PackageTests/MultiRepl/NotEnabledFail/cabal.multirepl-a.out @@ -1,4 +1,5 @@ # cabal v2-repl +Querying pkg-config database... Resolving dependencies... Error: [Cabal-7076] Cannot open a repl for multiple components at once. The targets 'pkg-a' and 'pkg-b' refer to different components.. diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/Failing/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/Failing/cabal.out index 5dee45c63bd..fb6a6d95418 100644 --- a/cabal-testsuite/PackageTests/MultipleLibraries/Failing/cabal.out +++ b/cabal-testsuite/PackageTests/MultipleLibraries/Failing/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Error: [Cabal-7107] Could not resolve dependencies: diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/Successful/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/Successful/cabal.out index 272b9fc6b4c..f3e560c3a11 100644 --- a/cabal-testsuite/PackageTests/MultipleLibraries/Successful/cabal.out +++ b/cabal-testsuite/PackageTests/MultipleLibraries/Successful/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6083Post/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6083Post/cabal.out index fb7bb90085f..6db06482c12 100644 --- a/cabal-testsuite/PackageTests/MultipleLibraries/T6083Post/cabal.out +++ b/cabal-testsuite/PackageTests/MultipleLibraries/T6083Post/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6083PostMixin/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6083PostMixin/cabal.out index fb7bb90085f..6db06482c12 100644 --- a/cabal-testsuite/PackageTests/MultipleLibraries/T6083PostMixin/cabal.out +++ b/cabal-testsuite/PackageTests/MultipleLibraries/T6083PostMixin/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6083Pre/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6083Pre/cabal.out index fbeef6a0af7..c251ea04832 100644 --- a/cabal-testsuite/PackageTests/MultipleLibraries/T6083Pre/cabal.out +++ b/cabal-testsuite/PackageTests/MultipleLibraries/T6083Pre/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6083PreMixin/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6083PreMixin/cabal.out index fbeef6a0af7..c251ea04832 100644 --- a/cabal-testsuite/PackageTests/MultipleLibraries/T6083PreMixin/cabal.out +++ b/cabal-testsuite/PackageTests/MultipleLibraries/T6083PreMixin/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/T6894/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/T6894/cabal.out index 8f3f3286d40..20c8307e5cf 100644 --- a/cabal-testsuite/PackageTests/MultipleLibraries/T6894/cabal.out +++ b/cabal-testsuite/PackageTests/MultipleLibraries/T6894/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBench/MultipleBenchmarks/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdBench/MultipleBenchmarks/cabal.out index cff1673e167..d8c11808aca 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdBench/MultipleBenchmarks/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdBench/MultipleBenchmarks/cabal.out @@ -1,4 +1,5 @@ # cabal v2-bench +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.out index 84b8bdd781b..8e9a20cb1a1 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdBench/OptionsFlag/cabal.out @@ -1,4 +1,5 @@ # cabal v2-bench +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBench/WarningRTS/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdBench/WarningRTS/cabal.out index 84eec3eeae3..365b8dd68c4 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdBench/WarningRTS/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdBench/WarningRTS/cabal.out @@ -1,4 +1,5 @@ # cabal bench +Querying pkg-config database... Resolving dependencies... Warning: Some RTS options were found standalone, which affect cabal and not the binary. Please note that +RTS inside the --benchmark-options argument suffices if your goal is to affect the benchmarked binary. For example, use "cabal test --benchmark-options='+RTS -N'" to pass the '-N' RTS option to your binary. Build profile: -w ghc- -O1 diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/OnlyConfigure/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/OnlyConfigure/cabal.out index 594f392e735..e66f8d7121c 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/OnlyConfigure/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/OnlyConfigure/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/Script/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/Script/cabal.out index 2beca69d00a..3fdd5e01148 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/Script/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/Script/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRepl/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRepl/cabal.out index 26bb87bc759..d0c62937663 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRepl/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRepl/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRun/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRun/cabal.out index f48266b0237..c91dae4b42b 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRun/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRun/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.out index 2146fdb0597..86d288af0f0 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Keep/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Keep/cabal.out index 33d10c75d20..077ca62113a 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Keep/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Keep/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Orphan/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Orphan/cabal.out index 33d10c75d20..077ca62113a 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Orphan/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Orphan/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Script/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Script/cabal.out index b9a5461ed1f..2568b3c7dd4 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdClean/Script/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdClean/Script/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdExec/GhcInvocation/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdExec/GhcInvocation/cabal.out index 437714d34bd..af48de835bb 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdExec/GhcInvocation/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdExec/GhcInvocation/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdExec/RunExe/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdExec/RunExe/cabal.out index 2ae9f2a0fd4..35cba8423de 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdExec/RunExe/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdExec/RunExe/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRepl/Script/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRepl/Script/cabal.out index 529ab3b1d57..fbee461e7a9 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRepl/Script/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRepl/Script/cabal.out @@ -1,4 +1,5 @@ # cabal v2-repl +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRepl/ScriptRerun/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRepl/ScriptRerun/cabal.out index 9c5de41fa1b..f7a55fe843f 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRepl/ScriptRerun/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRepl/ScriptRerun/cabal.out @@ -1,4 +1,5 @@ # cabal v2-repl +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Datafiles/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Datafiles/cabal.out index 8893a5acdc9..194d319c909 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Datafiles/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Datafiles/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExeAndLib/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExeAndLib/cabal.out index 02391a63734..6c35658e7cd 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExeAndLib/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExeAndLib/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExitCodePropagation/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExitCodePropagation/cabal.out index 0cf6a51332f..d4de27442a7 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExitCodePropagation/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExitCodePropagation/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultipleExes/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultipleExes/cabal.out index 2223a88a94c..e16393b993e 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultipleExes/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultipleExes/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.out index 7f851dca6a8..c98983a2ecd 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/RunMainBad/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/RunMainBad/cabal.out index 25b71f37cce..8ab574859d8 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/RunMainBad/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/RunMainBad/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Error: [Cabal-7070] The run command can only run an executable as a whole, not files or modules within them, but the target 'Main.hs' refers to the file Main.hs in the executable foo. diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.out index 936db57d6be..8765db84294 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.out index 0615cc31a41..7bef21aa7b7 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptNoExtension/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptNoExtension/cabal.out index 4e546999e4f..7d2a8397bf6 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptNoExtension/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptNoExtension/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptRerun/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptRerun/cabal.out index bb73c8f8d9d..d48727e6b18 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptRerun/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptRerun/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptWithProjectBlock/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptWithProjectBlock/cabal.out index eff617ace67..06761e6bb88 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptWithProjectBlock/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptWithProjectBlock/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O2 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Single/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Single/cabal.out index 2d03fa7af39..8500e672358 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/Single/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/Single/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/WarningRTS/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/WarningRTS/cabal.out index a7f6033bb1d..2656e443739 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/WarningRTS/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/WarningRTS/cabal.out @@ -1,4 +1,5 @@ # cabal run +Querying pkg-config database... Resolving dependencies... Warning: Your RTS options are applied to cabal, not the executable. Use '--' to separate cabal options from your executable options. For example, use 'cabal run -- +RTS -N to pass the '-N' RTS option to your executable. Build profile: -w ghc- -O1 diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.out index 55aac7326b6..bca92387511 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdTest/OptionsFlag/cabal.out @@ -1,4 +1,5 @@ # cabal v2-test +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdTest/WarningRTS/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdTest/WarningRTS/cabal.out index aef2481eac8..2e7f3b8bfef 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdTest/WarningRTS/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/CmdTest/WarningRTS/cabal.out @@ -1,4 +1,5 @@ # cabal test +Querying pkg-config database... Resolving dependencies... Warning: Some RTS options were found standalone, which affect cabal and not the binary. Please note that +RTS inside the --test-options argument suffices if your goal is to affect the tested binary. For example, use "cabal test --test-options='+RTS -N'" to pass the '-N' RTS option to your binary. Build profile: -w ghc- -O1 diff --git a/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out b/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out index 93f0fd7f938..c1a41dc74f5 100644 --- a/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out index 3c7beab60c7..8e91e469ce5 100644 --- a/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.out index bb8adff32b7..d2070bfb2e7 100644 --- a/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Error: [Cabal-7107] Could not resolve dependencies: diff --git a/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out index 2175160b583..176f6e93d00 100644 --- a/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out index 2b684028ae0..743230c0157 100644 --- a/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewBuild/T4477/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T4477/cabal.out index e8c59896590..e12d85e3d73 100644 --- a/cabal-testsuite/PackageTests/NewBuild/T4477/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/T4477/cabal.out @@ -1,4 +1,5 @@ # cabal v2-run +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewFreeze/BuildTools/new_freeze.out b/cabal-testsuite/PackageTests/NewFreeze/BuildTools/new_freeze.out index 24724d62291..698e615ff1f 100644 --- a/cabal-testsuite/PackageTests/NewFreeze/BuildTools/new_freeze.out +++ b/cabal-testsuite/PackageTests/NewFreeze/BuildTools/new_freeze.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following would be built: diff --git a/cabal-testsuite/PackageTests/NewFreeze/Flags/new_freeze.out b/cabal-testsuite/PackageTests/NewFreeze/Flags/new_freeze.out index fdaca207030..60cb4549fab 100644 --- a/cabal-testsuite/PackageTests/NewFreeze/Flags/new_freeze.out +++ b/cabal-testsuite/PackageTests/NewFreeze/Flags/new_freeze.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following would be built: diff --git a/cabal-testsuite/PackageTests/NewFreeze/FreezeFile/new_freeze.out b/cabal-testsuite/PackageTests/NewFreeze/FreezeFile/new_freeze.out index e768c91b531..965fc7bbcef 100644 --- a/cabal-testsuite/PackageTests/NewFreeze/FreezeFile/new_freeze.out +++ b/cabal-testsuite/PackageTests/NewFreeze/FreezeFile/new_freeze.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following would be built: diff --git a/cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out index ac34ca8e161..7b15d0379c3 100644 --- a/cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out +++ b/cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal haddock +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out index b1bcf12d3fa..fca88cc7fd0 100644 --- a/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out +++ b/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockForHackageCmdOutput/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockForHackageCmdOutput/cabal.out index e17593a966c..0392eb7ac90 100644 --- a/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockForHackageCmdOutput/cabal.out +++ b/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockForHackageCmdOutput/cabal.out @@ -1,4 +1,5 @@ # cabal haddock +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputCmd/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputCmd/cabal.out index 38e56384678..24e9df27ce3 100644 --- a/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputCmd/cabal.out +++ b/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputCmd/cabal.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal haddock +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputConfig/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputConfig/cabal.out index 38e56384678..24e9df27ce3 100644 --- a/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputConfig/cabal.out +++ b/cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputConfig/cabal.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal haddock +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out index 9397fb7d076..fe15edad731 100644 --- a/cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out +++ b/cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal haddock +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/OfflineFlag/offlineFlag.out b/cabal-testsuite/PackageTests/OfflineFlag/offlineFlag.out index a7b18a253a6..ab4ca308903 100644 --- a/cabal-testsuite/PackageTests/OfflineFlag/offlineFlag.out +++ b/cabal-testsuite/PackageTests/OfflineFlag/offlineFlag.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-base.out b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-base.out index 506ac48f14e..c31a3378f96 100644 --- a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-base.out +++ b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-base.out @@ -8,6 +8,7 @@ Installing library in # Setup register Registering library for p-1.0... # cabal v2-build +Querying pkg-config database... Resolving dependencies... Error: [Cabal-7107] Could not resolve dependencies: diff --git a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-p.out b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-p.out index 2235fc32f50..12b3906761d 100644 --- a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-p.out +++ b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-p.out @@ -8,6 +8,7 @@ Installing library in # Setup register Registering library for p-1.0... # cabal v2-build +Querying pkg-config database... Resolving dependencies... Error: [Cabal-7107] Could not resolve dependencies: diff --git a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-packagedbs.out b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-packagedbs.out index 5697c77102c..7b0d6bb8693 100644 --- a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-packagedbs.out +++ b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-packagedbs.out @@ -1,3 +1,4 @@ # cabal v2-build +Querying pkg-config database... Error: [Cabal-2300] No package databases have been specified. If you use --package-db=clear, you must follow it with --package-db= with 'global', 'user' or a specific file. diff --git a/cabal-testsuite/PackageTests/PackageDB/cabal-manual-packagedb.out b/cabal-testsuite/PackageTests/PackageDB/cabal-manual-packagedb.out index e1c59d1cbb8..70f6f671c86 100644 --- a/cabal-testsuite/PackageTests/PackageDB/cabal-manual-packagedb.out +++ b/cabal-testsuite/PackageTests/PackageDB/cabal-manual-packagedb.out @@ -8,6 +8,7 @@ Installing library in # Setup register Registering library for p-1.0... # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/PackageDB/cabal-packagedb.out b/cabal-testsuite/PackageTests/PackageDB/cabal-packagedb.out index e1c59d1cbb8..70f6f671c86 100644 --- a/cabal-testsuite/PackageTests/PackageDB/cabal-packagedb.out +++ b/cabal-testsuite/PackageTests/PackageDB/cabal-packagedb.out @@ -8,6 +8,7 @@ Installing library in # Setup register Registering library for p-1.0... # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Project/WarnBuilddir/cabal.out b/cabal-testsuite/PackageTests/Project/WarnBuilddir/cabal.out index e9f76666d89..fafc03b3d7b 100644 --- a/cabal-testsuite/PackageTests/Project/WarnBuilddir/cabal.out +++ b/cabal-testsuite/PackageTests/Project/WarnBuilddir/cabal.out @@ -1,5 +1,6 @@ # cabal v2-build Warning: The builddir option is not supported in project and config files. It will be ignored. +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following would be built: diff --git a/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out b/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out index 7bc5e2e63a6..edd2ed8ff18 100644 --- a/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out +++ b/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following would be built: diff --git a/cabal-testsuite/PackageTests/Regression/T4202/cabal.out b/cabal-testsuite/PackageTests/Regression/T4202/cabal.out index a7bae1abdb2..c393ad1eba1 100644 --- a/cabal-testsuite/PackageTests/Regression/T4202/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T4202/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Regression/T4720/cabal.out b/cabal-testsuite/PackageTests/Regression/T4720/cabal.out index 3cf3d3afe28..4927ad42da3 100644 --- a/cabal-testsuite/PackageTests/Regression/T4720/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T4720/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Regression/T5213/cabal.out b/cabal-testsuite/PackageTests/Regression/T5213/cabal.out index b713ff1904f..0f4bb087660 100644 --- a/cabal-testsuite/PackageTests/Regression/T5213/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T5213/cabal.out @@ -1,4 +1,5 @@ # cabal new-test +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Regression/T5213ExeCoverage/cabal.out b/cabal-testsuite/PackageTests/Regression/T5213ExeCoverage/cabal.out index ddf36d02ef5..d7a59f888df 100644 --- a/cabal-testsuite/PackageTests/Regression/T5213ExeCoverage/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T5213ExeCoverage/cabal.out @@ -1,4 +1,5 @@ # cabal new-test +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Regression/T5309/cabal.out b/cabal-testsuite/PackageTests/Regression/T5309/cabal.out index e799843e5b6..9c8bf039d12 100644 --- a/cabal-testsuite/PackageTests/Regression/T5309/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T5309/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Regression/T5677/cabal.out b/cabal-testsuite/PackageTests/Regression/T5677/cabal.out index 88bc2862665..8556e46b951 100644 --- a/cabal-testsuite/PackageTests/Regression/T5677/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T5677/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Regression/T6334/cabal.out b/cabal-testsuite/PackageTests/Regression/T6334/cabal.out index a0a58d72357..c58f9f10a5b 100644 --- a/cabal-testsuite/PackageTests/Regression/T6334/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T6334/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Regression/T6853/cabal.out b/cabal-testsuite/PackageTests/Regression/T6853/cabal.out index 75fe8d9ef1c..138aac35be6 100644 --- a/cabal-testsuite/PackageTests/Regression/T6853/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T6853/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Regression/T6961/DepExternal/cabal.out b/cabal-testsuite/PackageTests/Regression/T6961/DepExternal/cabal.out index a063ee92cb8..7f0a98c8715 100644 --- a/cabal-testsuite/PackageTests/Regression/T6961/DepExternal/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T6961/DepExternal/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following would be built: diff --git a/cabal-testsuite/PackageTests/Regression/T6961/DepInternal/cabal.out b/cabal-testsuite/PackageTests/Regression/T6961/DepInternal/cabal.out index cda3c265371..88f30aea4b7 100644 --- a/cabal-testsuite/PackageTests/Regression/T6961/DepInternal/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T6961/DepInternal/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Error: [Cabal-7107] Could not resolve dependencies: diff --git a/cabal-testsuite/PackageTests/Regression/T6961/Exe/cabal.out b/cabal-testsuite/PackageTests/Regression/T6961/Exe/cabal.out index bde31817cf4..54e2d652c22 100644 --- a/cabal-testsuite/PackageTests/Regression/T6961/Exe/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T6961/Exe/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following would be built: diff --git a/cabal-testsuite/PackageTests/Regression/T6961/Test/cabal.out b/cabal-testsuite/PackageTests/Regression/T6961/Test/cabal.out index 8f28d66058a..7af3ac1eb97 100644 --- a/cabal-testsuite/PackageTests/Regression/T6961/Test/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T6961/Test/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following would be built: diff --git a/cabal-testsuite/PackageTests/Regression/T7234/Fail/cabal.out b/cabal-testsuite/PackageTests/Regression/T7234/Fail/cabal.out index 5c8ed7ba2c5..53dcd75bed2 100644 --- a/cabal-testsuite/PackageTests/Regression/T7234/Fail/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T7234/Fail/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Error: [Cabal-7107] Could not resolve dependencies: diff --git a/cabal-testsuite/PackageTests/Regression/T7234/Success/cabal.out b/cabal-testsuite/PackageTests/Regression/T7234/Success/cabal.out index a0c85309b1f..ac56c4d753a 100644 --- a/cabal-testsuite/PackageTests/Regression/T7234/Success/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T7234/Success/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/Regression/T8507/cabal.out b/cabal-testsuite/PackageTests/Regression/T8507/cabal.out index a4b777afbbc..6da96aebbd6 100644 --- a/cabal-testsuite/PackageTests/Regression/T8507/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T8507/cabal.out @@ -1,4 +1,5 @@ # cabal v2-build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/RelativePathProjectImports/cabal.out b/cabal-testsuite/PackageTests/RelativePathProjectImports/cabal.out index 53ac1b8e71c..a5fa0456e57 100644 --- a/cabal-testsuite/PackageTests/RelativePathProjectImports/cabal.out +++ b/cabal-testsuite/PackageTests/RelativePathProjectImports/cabal.out @@ -1,4 +1,5 @@ # cabal build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: @@ -15,6 +16,7 @@ Configuring library for main-0.1... Preprocessing library for main-0.1... Building library for main-0.1... # cabal build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-no-load.out b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-no-load.out index 6f2908d3f26..6af45a89e4a 100644 --- a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-no-load.out +++ b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-no-load.out @@ -1,5 +1,6 @@ # cabal clean # cabal repl +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-normal.out b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-normal.out index 68ecdbe4008..770ba1e1636 100644 --- a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-normal.out +++ b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.exec-normal.out @@ -1,5 +1,6 @@ # cabal clean # cabal repl +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-no-load.out b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-no-load.out index 6f2908d3f26..6af45a89e4a 100644 --- a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-no-load.out +++ b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-no-load.out @@ -1,5 +1,6 @@ # cabal clean # cabal repl +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-normal.out b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-normal.out index 6f2908d3f26..6af45a89e4a 100644 --- a/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-normal.out +++ b/cabal-testsuite/PackageTests/ReplNoLoad/cabal.lib-normal.out @@ -1,5 +1,6 @@ # cabal clean # cabal repl +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options-multiple-flags.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options-multiple-flags.out index 374ac0dd8c3..23e95d1d6ae 100644 --- a/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options-multiple-flags.out +++ b/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options-multiple-flags.out @@ -1,5 +1,6 @@ # cabal clean # cabal v2-repl +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options.out index 374ac0dd8c3..23e95d1d6ae 100644 --- a/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options.out +++ b/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options.out @@ -1,5 +1,6 @@ # cabal clean # cabal v2-repl +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out index ba1bbef88db..3f85f07e92c 100644 --- a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out +++ b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out @@ -1,5 +1,6 @@ # cabal clean # cabal v2-repl +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags.out index 374ac0dd8c3..23e95d1d6ae 100644 --- a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags.out +++ b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags.out @@ -1,5 +1,6 @@ # cabal clean # cabal v2-repl +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options.out index 374ac0dd8c3..23e95d1d6ae 100644 --- a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options.out +++ b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options.out @@ -1,5 +1,6 @@ # cabal clean # cabal v2-repl +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-all.out b/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-all.out index e37e3fccc4d..8cd0264bc6e 100644 --- a/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-all.out +++ b/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-all.out @@ -1,4 +1,5 @@ # cabal build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-exe.out b/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-exe.out index 7c69357323d..7c145c58a09 100644 --- a/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-exe.out +++ b/cabal-testsuite/PackageTests/ShowBuildInfo/A/build-info-exe.out @@ -1,4 +1,5 @@ # cabal build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/A/remove-outdated.out b/cabal-testsuite/PackageTests/ShowBuildInfo/A/remove-outdated.out index 3ad97d2f378..cf640b93bdf 100644 --- a/cabal-testsuite/PackageTests/ShowBuildInfo/A/remove-outdated.out +++ b/cabal-testsuite/PackageTests/ShowBuildInfo/A/remove-outdated.out @@ -1,4 +1,5 @@ # cabal build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/CompileFail/compile-fail.out b/cabal-testsuite/PackageTests/ShowBuildInfo/CompileFail/compile-fail.out index b0cae576cd6..e0744e245ed 100644 --- a/cabal-testsuite/PackageTests/ShowBuildInfo/CompileFail/compile-fail.out +++ b/cabal-testsuite/PackageTests/ShowBuildInfo/CompileFail/compile-fail.out @@ -1,4 +1,5 @@ # cabal build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/single.out b/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/single.out index 81f5bc74a66..dcf3d4ef3d9 100644 --- a/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/single.out +++ b/cabal-testsuite/PackageTests/ShowBuildInfo/Complex/single.out @@ -1,6 +1,7 @@ # cabal v2-update Downloading the latest package list from test-local-repo # cabal build +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/TestCodeGenerator/cabal.out b/cabal-testsuite/PackageTests/TestCodeGenerator/cabal.out index b6691231474..fd556aee46d 100644 --- a/cabal-testsuite/PackageTests/TestCodeGenerator/cabal.out +++ b/cabal-testsuite/PackageTests/TestCodeGenerator/cabal.out @@ -1,4 +1,5 @@ # cabal v2-test +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out b/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out index 8fb3ea6d6d3..96a44123c45 100644 --- a/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out +++ b/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out @@ -1,4 +1,5 @@ # cabal v2-test +Querying pkg-config database... Resolving dependencies... Build profile: -w ghc- -O1 In order, the following will be built: diff --git a/changelog.d/pr-9422 b/changelog.d/pr-9422 new file mode 100644 index 00000000000..e9c8e3c8d9f --- /dev/null +++ b/changelog.d/pr-9422 @@ -0,0 +1,12 @@ +synopsis: Add separate cache for getPkgConfigDb +packages: cabal-install +prs: #9422 +issues: #8930 + +description: { + Querying pkg-config for the version of every module can be a very expensive + operation on some systems. This change adds a separate, per-project, cache for + pkgConfigDB; reducing the cost from "every plan change" to "every pkg-config-db + change per project". A notice is also presented to the user when refreshing the + packagedb. +}