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

* Do not include broken plugins while compiling fpmake.pps

Browse Source 
git-svn-id: trunk@35525 -
This commit is contained in:
joost 2017-03-05 19:50:14 +00:00
parent 6a1d01b352
commit e37ddbf2f5
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/fppkg/src/pkgfpmake.pp
View File

@ -164,6 +164,8 @@ Var
FPMakeSrc : string; FPMakeSrc : string;
NeedFPMKUnitSource, NeedFPMKUnitSource,
HaveFpmake : boolean; HaveFpmake : boolean;
FPMKUnitDepAvailable: Boolean;
FPMKUnitDepPackage: TFPPackage;
P : TFPPackage; P : TFPPackage;
begin begin
P:=PackageManager.PackageByName(PackageName, pkgpkAvailable); P:=PackageManager.PackageByName(PackageName, pkgpkAvailable);
@ -192,7 +194,22 @@ begin
AddOption('-dCOMPILED_BY_FPPKG'); AddOption('-dCOMPILED_BY_FPPKG');
for i:=0 to high(FPMKUnitDeps) do for i:=0 to high(FPMKUnitDeps) do
begin begin
if FPMKUnitDeps[i].available then FPMKUnitDepAvailable := FPMKUnitDeps[i].available;
if FPMKUnitDepAvailable then
begin
// Do not try to use packages which are broken. This can happen when
// fixbroken is being called and one of the fpmkunit-dependencies itself
// is broken. In that case, build fpmake without the dependency.
// (Plugins are also fpmkunit-dependencies)
FPMKUnitDepPackage := PackageManager.FindPackage(FPMKUnitDeps[i].package, pkgpkInstalled);
if Assigned(FPMKUnitDepPackage) then
begin
if PackageManager.PackageIsBroken(FPMKUnitDepPackage, nil) then
FPMKUnitDepAvailable := False;
end;
end;
if FPMKUnitDepAvailable then
begin begin
if CheckUnitDir(FPMKUnitDeps[i].package,DepDir) then if CheckUnitDir(FPMKUnitDeps[i].package,DepDir) then
AddOption('-Fu'+DepDir) AddOption('-Fu'+DepDir)