paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-23 05:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Do not try to resolve dependencies for packages that not meet the target

Browse Source 
git-svn-id: trunk@44470 -
This commit is contained in:
joost 2020-03-31 20:15:08 +00:00
parent 81887a2eb3
commit 625e847e56
2 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/fppkg/src/pkgcommands.pp
View File

@ -585,6 +585,10 @@ begin
begin
// Find and List dependencies
L:=TStringList.Create;
if not ((PackageManager.CompilerOptions.CompilerOS in P.OSes) and (PackageManager.CompilerOptions.CompilerCPU in P.CPUs)) then
Log(llDebug,SDbgPackageDependencyOtherTarget,[P.Name,MakeTargetString(PackageManager.CompilerOptions.CompilerCPU,PackageManager.CompilerOptions.CompilerOS)])
else
for i:=0 to P.Dependencies.Count-1 do
begin
D:=P.Dependencies[i];

1
packages/fppkg/src/pkgmessages.pp
View File

@ -158,6 +158,7 @@ Resourcestring
SDbgBackupFile = 'Creating Backup File "%s"';
SDbgPackageMultipleLocations = 'Multiple installations found for package %s, using installation "%s"';
SDbgPackageDependencyOtherTarget = 'Dependency on package %s is not for %s';
SDbgPackageDepOtherTarget = 'Package %s is not for %s, skipping it''s dependencies';
SDbgObsoleteDependency = 'Package %s depends on package %s which is not installed anymore';
SDbgForcePackageInstall = 'Installation of package "%s" forced';
SDbgPackageInstallRequired = 'Installation of package "%s" required for repository "%s"';