* Also check cpu and os when the package in the current directory is used

git-svn-id: trunk@15258 -

utils/fppkg/fprepos.pp

@@ -659,6 +659,8 @@ begin
       Description:=P.Description;
       HomepageURL:=P.HomepageURL;
       DownloadURL:=P.DownloadURL;
+      OSes:=P.OSes;
+      CPUs:=P.CPUs;
       FileName:=P.FileName;
       Checksum:=P.Checksum;
       Dependencies.Clear;

utils/fppkg/pkgfpmake.pp

@@ -244,6 +244,7 @@ end;
 
 Function TFPMakeRunner.RunFPMake(const Command:string) : Integer;
 Var
+  ManifestPackage,
   P : TFPPackage;
   FPMakeBin,
   OOptions : string;
@@ -259,7 +260,16 @@ begin
   OOptions:='';
   // Does the current package support this CPU-OS?
   if PackageName<>'' then
-    P:=AvailableRepository.PackageByName(PackageName)
+    begin
+      P:=AvailableRepository.PackageByName(PackageName);
+      if (PackageName=CurrentDirPackageName) and (FileExists(ManifestFileName)) then
+        begin
+          ManifestPackage:=LoadManifestFromFile(ManifestFileName);
+          P.OSes:=ManifestPackage.OSes;
+          P.CPUs:=ManifestPackage.CPUs;
+          ManifestPackage.Free;
+        end;
+    end
   else
     P:=nil;
   if assigned(P) then