diff --git a/.gitignore b/.gitignore index 4154c97..49d307d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ fpcbuild-2.4.0.tar.gz /fpcbuild-3.0.0.tar.gz /fpc-3.0.0-bin-armv7hl.tar.gz /fpc-3.0.0-bin-ppc64.tar.gz +/fpcbuild-3.0.2.tar.gz diff --git a/fpc-3.0.0-r32527.patch b/fpc-3.0.0-r32527.patch deleted file mode 100644 index d8617dd..0000000 --- a/fpc-3.0.0-r32527.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: rtl/linux/powerpc64/cprt0.as -=================================================================== ---- fpcsrc/rtl/linux/powerpc64/cprt0.as (revision 32526) -+++ fpcsrc/rtl/linux/powerpc64/cprt0.as (revision 32527) -@@ -373,7 +373,7 @@ - /* PPC64 ABI uses R13 for thread local, so we leave it alone */ - LOAD_64BIT_VAL 8, start_addresses - -- b .__libc_start_main -+ bl __libc_start_main - nop /* a NOP for the linker */ - - /* -Index: rtl/linux/powerpc64/gprt0.as -=================================================================== ---- fpcsrsc/rtl/linux/powerpc64/gprt0.as (revision 32526) -+++ fpcsrc/rtl/linux/powerpc64/gprt0.as (revision 32527) -@@ -373,7 +373,7 @@ - /* PPC64 ABI uses R13 for thread local, so we leave it alone */ - LOAD_64BIT_VAL 8, start_addresses - -- b .__libc_start_main -+ b __libc_start_main - nop /* a NOP for the linker */ - - /* -@@ -404,17 +404,17 @@ - LOAD_64BIT_VAL 3, _start - ld 3, 0(3) - LOAD_64BIT_VAL 4, etext -- bl .__monstartup -+ bl __monstartup - nop - - LOAD_64BIT_VAL 3, _mcleanup -- bl .atexit -+ bl atexit - nop - -- bl .PASCALMAIN -+ bl PASCALMAIN - nop - -- b ._haltproc -+ b ._haltproc - - FUNCTION_PROLOG _haltproc - LOAD_64BIT_VAL 8, ___fpc_ret diff --git a/fpc-3.0.0-r32374.patch b/fpc-3.0.2-r32374.patch similarity index 98% rename from fpc-3.0.0-r32374.patch rename to fpc-3.0.2-r32374.patch index 6207206..a7d6bb4 100644 --- a/fpc-3.0.0-r32374.patch +++ b/fpc-3.0.2-r32374.patch @@ -1,4 +1,4 @@ -Index: utils/fpdoc/dw_html.pp +Index: fpcsrc/utils/fpdoc/dw_html.pp =================================================================== --- fpcsrc/utils/fpdoc/dw_html.pp (revision 32373) +++ fpcsrc/utils/fpdoc/dw_html.pp (revision 32374) @@ -11,7 +11,7 @@ Index: utils/fpdoc/dw_html.pp // Dummy TObject E:=B.ClassTree.DocumentElement; PushClassList; -Index: utils/fpdoc/mkfpdoc.pp +Index: fpcsrc/utils/fpdoc/mkfpdoc.pp =================================================================== --- fpcsrc/utils/fpdoc/mkfpdoc.pp (revision 32373) +++ fpcsrc/utils/fpdoc/mkfpdoc.pp (revision 32374) @@ -179,7 +179,20 @@ Index: utils/fpdoc/mkfpdoc.pp begin With TXMLFPDocOptions.Create(self) do try -Index: utils/fpdoc/fpdoc.pp +Index: fpcsrc/utils/fpdoc/dglobals.pp +=================================================================== +--- fpcsrc/utils/fpdoc/dglobals.pp (revision 32373) ++++ fpcsrc/utils/fpdoc/dglobals.pp (revision 32374) +@@ -142,6 +142,8 @@ + SCopyright2 = '(c) 2005 - 2012 various FPC contributors'; + + SCmdLineHelp = 'Usage: %s [options]'; ++ SUsageOption008 = '--base-descr-dir=DIR prefix all description files with this directory'; ++ SUsageOption009 = '--base-input-dir=DIR prefix all input files with this directory'; + SUsageOption010 = '--content Create content file for package cross-references'; + SUsageOption020 = '--cputarget=value Set the target CPU for the scanner.'; + SUsageOption030 = '--descr=file use file as description file, e.g.: '; +Index: fpcsrc/utils/fpdoc/fpdoc.pp =================================================================== --- fpcsrc/utils/fpdoc/fpdoc.pp (revision 32373) +++ fpcsrc/utils/fpdoc/fpdoc.pp (revision 32374) @@ -210,16 +223,3 @@ Index: utils/fpdoc/fpdoc.pp else if (Cmd = '--input-dir') then begin AddDirToFileList(SelectedPackage.Inputs, Arg,'*.pp'); -Index: utils/fpdoc/dglobals.pp -=================================================================== ---- fpcsrc/utils/fpdoc/dglobals.pp (revision 32373) -+++ fpcsrc/utils/fpdoc/dglobals.pp (revision 32374) -@@ -142,6 +142,8 @@ - SCopyright2 = '(c) 2005 - 2012 various FPC contributors'; - - SCmdLineHelp = 'Usage: %s [options]'; -+ SUsageOption008 = '--base-descr-dir=DIR prefix all description files with this directory'; -+ SUsageOption009 = '--base-input-dir=DIR prefix all input files with this directory'; - SUsageOption010 = '--content Create content file for package cross-references'; - SUsageOption020 = '--cputarget=value Set the target CPU for the scanner.'; - SUsageOption030 = '--descr=file use file as description file, e.g.: '; diff --git a/fpc-3.0.2-r34749.patch b/fpc-3.0.2-r34749.patch new file mode 100644 index 0000000..b4919eb --- /dev/null +++ b/fpc-3.0.2-r34749.patch @@ -0,0 +1,390 @@ +Index: fpcsrc/utils/fpdoc/dglobals.pp +=================================================================== +--- fpcsrc/utils/fpdoc/dglobals.pp (revision 34748) ++++ fpcsrc/utils/fpdoc/dglobals.pp (revision 34749) +@@ -161,6 +161,7 @@ + SUsageOption120 = ' At least one input option is required.'; + SUsageOption130 = '--input-dir=Dir Add All *.pp and *.pas files in Dir to list of input files'; + SUsageOption140 = '--lang=lng Select output language.'; ++ SUsageOption145 = '--macro=name=value Define a macro to preprocess the project file with.'; + SUsageOption150 = '--ostarget=value Set the target OS for the scanner.'; + SUsageOption160 = '--output=name use name as the output name.'; + SUsageOption170 = ' Each backend interprets this as needed.'; +@@ -183,6 +184,7 @@ + SUsageFormats = 'The following output formats are supported by this fpdoc:'; + SUsageBackendHelp = 'Specify an output format, combined with --help to get more help for this backend.'; + SUsageFormatSpecific = 'Output format "%s" supports the following options:'; ++ SCmdLineErrInvalidMacro = 'Macro needs to be in the form name=value'; + + SCmdLineInvalidOption = 'Ignoring unknown option "%s"'; + SCmdLineInvalidFormat = 'Invalid format "%s" specified'; +Index: fpcsrc/utils/fpdoc/mkfpdoc.pp +=================================================================== +--- fpcsrc/utils/fpdoc/mkfpdoc.pp (revision 34748) ++++ fpcsrc/utils/fpdoc/mkfpdoc.pp (revision 34749) +@@ -26,6 +26,7 @@ + FOnLog: TPasParserLogHandler; + FPParserLogEvents: TPParserLogEvents; + FProject : TFPDocProject; ++ FProjectMacros: TStrings; + FScannerLogEvents: TPScannerLogEvents; + FVerbose: Boolean; + function GetOptions: TEngineOptions; +@@ -32,6 +33,7 @@ + function GetPackages: TFPDocPackages; + procedure SetBaseDescrDir(AValue: String); + procedure SetBaseInputDir(AValue: String); ++ procedure SetProjectMacros(AValue: TStrings); + Protected + Function FixInputFile(Const AFileName : String) : String; + Function FixDescrFile(Const AFileName : String) : String; +@@ -58,6 +60,8 @@ + // When set, they will be prepended to non-absolute filenames. + Property BaseInputDir : String Read FBaseInputDir Write SetBaseInputDir; + Property BaseDescrDir : String Read FBaseDescrDir Write SetBaseDescrDir; ++ // Macros used when loading the project file ++ Property ProjectMacros : TStrings Read FProjectMacros Write SetProjectMacros; + end; + + implementation +@@ -81,13 +85,13 @@ + end; + end; + +-Procedure TFPDocCreator.DoLog(Const Msg: String); ++procedure TFPDocCreator.DoLog(const Msg: String); + begin + If Assigned(OnLog) then + OnLog(Self,Msg); + end; + +-procedure TFPDocCreator.DoLog(Const Fmt: String; Args: Array of Const); ++procedure TFPDocCreator.DoLog(const Fmt: String; Args: array of const); + begin + DoLog(Format(Fmt,Args)); + end; +@@ -132,7 +136,7 @@ + Result:=FProject.Packages; + end; + +-Function TFPDocCreator.FixInputFile(Const AFileName: String): String; ++function TFPDocCreator.FixInputFile(const AFileName: String): String; + begin + Result:=AFileName; + If Result='' then exit; +@@ -140,7 +144,7 @@ + Result:=BaseInputDir+Result; + end; + +-Function TFPDocCreator.FixDescrFile(Const AFileName: String): String; ++function TFPDocCreator.FixDescrFile(const AFileName: String): String; + begin + Result:=AFileName; + If Result='' then exit; +@@ -164,13 +168,19 @@ + FBaseInputDir:=IncludeTrailingPathDelimiter(FBaseInputDir); + end; + +-Procedure TFPDocCreator.DoBeforeEmitNote(Sender: TObject; Note: TDomElement; +- Var EmitNote: Boolean); ++procedure TFPDocCreator.SetProjectMacros(AValue: TStrings); + begin ++ if FProjectMacros=AValue then Exit; ++ FProjectMacros.Assign(AValue); ++end; ++ ++procedure TFPDocCreator.DoBeforeEmitNote(Sender: TObject; Note: TDomElement; ++ var EmitNote: Boolean); ++begin + EmitNote:=True; + end; + +-Constructor TFPDocCreator.Create(AOwner: TComponent); ++constructor TFPDocCreator.Create(AOwner: TComponent); + begin + inherited Create(AOwner); + FProject:=TFPDocProject.Create(Self); +@@ -178,12 +188,14 @@ + FProject.Options.CPUTarget:=DefCPUTarget; + FProject.Options.OSTarget:=DefOSTarget; + FProcessedUnits:=TStringList.Create; ++ FProjectMacros:=TStringList.Create; + end; + +-Destructor TFPDocCreator.Destroy; ++destructor TFPDocCreator.Destroy; + begin + FreeAndNil(FProcessedUnits); + FreeAndNil(FProject); ++ FreeAndNil(FProjectMacros); + inherited Destroy; + end; + +@@ -221,7 +233,7 @@ + Engine.WriteContentFile(APackage.ContentFile); + end; + +-Procedure TFPDocCreator.CreateDocumentation(APackage: TFPDocPackage; ++procedure TFPDocCreator.CreateDocumentation(APackage: TFPDocPackage; + ParseOnly: Boolean); + + var +@@ -282,7 +294,7 @@ + end; + end; + +-Procedure TFPDocCreator.CreateProjectFile(Const AFileName: string); ++procedure TFPDocCreator.CreateProjectFile(const AFileName: string); + begin + With TXMLFPDocOptions.Create(Self) do + try +@@ -292,11 +304,14 @@ + end; + end; + +-Procedure TFPDocCreator.LoadProjectFile(Const AFileName: string); ++procedure TFPDocCreator.LoadProjectFile(const AFileName: string); + begin + With TXMLFPDocOptions.Create(self) do + try +- LoadOptionsFromFile(FProject,AFileName); ++ if (ProjectMacros.Count>0) then ++ LoadOptionsFromFile(FProject,AFileName,ProjectMacros) ++ else ++ LoadOptionsFromFile(FProject,AFileName,Nil); + finally + Free; + end; +Index: fpcsrc/utils/fpdoc/fpdoc.pp +=================================================================== +--- fpcsrc/utils/fpdoc/fpdoc.pp (revision 34748) ++++ fpcsrc/utils/fpdoc/fpdoc.pp (revision 34749) +@@ -90,6 +90,7 @@ + Writeln(SUsageOption120); + Writeln(SUsageOption130); + Writeln(SUsageOption140); ++ Writeln(SUsageOption145); + Writeln(SUsageOption150); + Writeln(SUsageOption160); + Writeln(SUsageOption170); +@@ -181,11 +182,12 @@ + Const + SOptProject = '--project='; + SOptPackage = '--package='; +- ++ SOptMacro = '--macro='; ++ + Function ProjectOpt(Const s : string) : boolean; + + begin +- Result:=(Copy(s,1,3)='-p=') or (Copy(s,1,Length(SOptProject))=SOptProject); ++ Result:=(Copy(s,1,3)='-p=') or (Copy(s,1,Length(SOptProject))=SOptProject) or (Copy(s,1,Length(SOptMacro))=SOptMacro); + end; + + Function PackageOpt(Const s : string) : boolean; +@@ -286,7 +288,7 @@ + + var + i: Integer; +- Cmd, Arg: String; ++ ProjectFileName,Cmd, Arg: String; + + begin + if (s = '-h') or (s = '--help') then +@@ -325,6 +327,12 @@ + AddDirToFileList(SelectedPackage.Descriptions, Arg, '*.xml') + else if (Cmd = '--base-descr-dir') then + FCreator.BaseDescrDir:=Arg ++ else if (Cmd = '--macro') then ++ begin ++ If Pos('=',Arg)=0 then ++ WriteLn(StdErr, Format(SCmdLineErrInvalidMacro, [Arg])); ++ FCreator.ProjectMacros.Add(Arg); ++ end + else if (Cmd = '-f') or (Cmd = '--format') then + begin + Arg:=UpperCase(Arg); +@@ -384,23 +392,28 @@ + Procedure TFPDocApplication.DoRun; + + begin +-{$IFDEF Unix} +- gettext.TranslateResourceStrings('/usr/local/share/locale/%s/LC_MESSAGES/fpdoc.mo'); +-{$ELSE} +- gettext.TranslateResourceStrings('intl/fpdoc.%s.mo'); +-{$ENDIF} +- WriteLn(STitle); +- WriteLn(Format(SVersion, [DefFPCVersion, DefFPCDate])); +- WriteLn(SCopyright1); +- WriteLn(SCopyright2); +- WriteLn; +- ParseCommandLine; +- if (FWriteProjectFile<>'') then +- FCreator.CreateProjectFile(FWriteProjectFile) +- else +- FCreator.CreateDocumentation(FPackage,FDryRun); +- WriteLn(SDone); +- Terminate; ++ try ++ {$IFDEF Unix} ++ gettext.TranslateResourceStrings('/usr/local/share/locale/%s/LC_MESSAGES/fpdoc.mo'); ++ {$ELSE} ++ gettext.TranslateResourceStrings('intl/fpdoc.%s.mo'); ++ {$ENDIF} ++ WriteLn(STitle); ++ WriteLn(Format(SVersion, [DefFPCVersion, DefFPCDate])); ++ WriteLn(SCopyright1); ++ WriteLn(SCopyright2); ++ WriteLn; ++ ParseCommandLine; ++ if (FWriteProjectFile<>'') then ++ FCreator.CreateProjectFile(FWriteProjectFile) ++ else ++ FCreator.CreateDocumentation(FPackage,FDryRun); ++ WriteLn(SDone); ++ Terminate; ++ except ++ ExitCode:=1; ++ Raise; ++ end; + end; + + constructor TFPDocApplication.Create(AOwner: TComponent); +Index: fpcsrc/utils/fpdoc/fpdocxmlopts.pas +=================================================================== +--- fpcsrc/utils/fpdoc/fpdocxmlopts.pas (revision 34748) ++++ fpcsrc/utils/fpdoc/fpdocxmlopts.pas (revision 34749) +@@ -13,6 +13,7 @@ + TXMLFPDocOptions = Class(TComponent) + private + Protected ++ Function PreProcessFile(const AFileName: String; Macros: TStrings): TStream; virtual; + Procedure Error(Const Msg : String); + Procedure Error(Const Fmt : String; Args : Array of Const); + Procedure LoadPackage(APackage : TFPDocPackage; E : TDOMElement); virtual; +@@ -24,7 +25,7 @@ + procedure SaveInputFile(const AInputFile: String; XML: TXMLDocument; AParent: TDOMElement);virtual; + Procedure SavePackage(APackage : TFPDocPackage; XML : TXMLDocument; AParent : TDOMElement); virtual; + Public +- Procedure LoadOptionsFromFile(AProject : TFPDocProject; Const AFileName : String); ++ Procedure LoadOptionsFromFile(AProject : TFPDocProject; Const AFileName : String; Macros : TStrings = Nil); + Procedure LoadFromXML(AProject : TFPDocProject; XML : TXMLDocument); virtual; + Procedure SaveOptionsToFile(AProject : TFPDocProject; Const AFileName : String); + procedure SaveToXML(AProject : TFPDocProject; ADoc: TXMLDocument); virtual; +@@ -65,7 +66,7 @@ + end; + + +-procedure TXMLFPDocOptions.Error(Const Msg: String); ++procedure TXMLFPDocOptions.Error(const Msg: String); + begin + Raise EXMLFPDoc.Create(Msg); + end; +@@ -248,7 +249,8 @@ + end; + end; + +-Procedure TXMLFPDocOptions.SaveEngineOptions(Options : TEngineOptions; XML : TXMLDocument; AParent : TDOMElement); ++procedure TXMLFPDocOptions.SaveEngineOptions(Options: TEngineOptions; ++ XML: TXMLDocument; AParent: TDOMElement); + + procedure AddStr(const n, v: string); + var +@@ -288,7 +290,8 @@ + end; + + +-Procedure TXMLFPDocOptions.SaveInputFile(Const AInputFile : String; XML : TXMLDocument; AParent: TDOMElement); ++procedure TXMLFPDocOptions.SaveInputFile(const AInputFile: String; ++ XML: TXMLDocument; AParent: TDOMElement); + + Var + F,O : String; +@@ -299,7 +302,8 @@ + AParent['options']:=O; + end; + +-Procedure TXMLFPDocOptions.SaveDescription(Const ADescription : String; XML : TXMLDocument; AParent: TDOMElement); ++procedure TXMLFPDocOptions.SaveDescription(const ADescription: String; ++ XML: TXMLDocument; AParent: TDOMElement); + + begin + AParent['file']:=ADescription; +@@ -317,7 +321,8 @@ + AParent['prefix']:=Copy(AImportFile,i+1,Length(AImportFile)); + end; + +-Procedure TXMLFPDocOptions.SavePackage(APackage: TFPDocPackage; XML : TXMLDocument; AParent: TDOMElement); ++procedure TXMLFPDocOptions.SavePackage(APackage: TFPDocPackage; ++ XML: TXMLDocument; AParent: TDOMElement); + + + var +@@ -358,17 +363,55 @@ + end; + + ++Function TXMLFPDocOptions.PreprocessFile(const AFileName: String; Macros : TStrings) : TStream; + +-procedure TXMLFPDocOptions.LoadOptionsFromFile(AProject: TFPDocProject; const AFileName: String); ++Var ++ F : TFileStream; ++ P : TTemplateParser; ++ I : Integer; ++ N,V : String; + ++begin ++ Result:=Nil; ++ P:=Nil; ++ F:=TFileStream.Create(AFileName,fmOpenRead or fmShareDenyWrite); ++ try ++ P:=TTemplateParser.Create; ++ P.AllowTagParams:=False; ++ P.StartDelimiter:='{{'; ++ P.EndDelimiter:='}}'; ++ For I:=0 to Macros.Count-1 do ++ begin ++ Macros.GetNameValue(I,N,V); ++ P.Values[N]:=V; ++ end; ++ Result:=TMemoryStream.Create; ++ P.ParseStream(F,Result); ++ Result.Position:=0; ++ finally ++ FreeAndNil(F); ++ FreeAndNil(P); ++ end; ++end; ++ ++procedure TXMLFPDocOptions.LoadOptionsFromFile(AProject: TFPDocProject; ++ const AFileName: String; Macros: TStrings = Nil); ++ + Var + XML : TXMLDocument; ++ S : TStream; + + begin +- ReadXMLFile(XML,AFileName); ++ XML:=Nil; ++ if Macros=Nil then ++ S:=TFileStream.Create(AFileName,fmOpenRead or fmShareDenyWrite) ++ else ++ S:=PreProcessFile(AFileName,Macros); + try ++ ReadXMLFile(XML,S); + LoadFromXML(AProject,XML); + finally ++ FreeAndNil(S); + FreeAndNil(XML); + end; + end; +@@ -393,7 +436,8 @@ + LoadEngineOptions(AProject.Options,N as TDOMElement); + end; + +-Procedure TXMLFPDocOptions.SaveOptionsToFile(AProject: TFPDocProject; const AFileName: String); ++procedure TXMLFPDocOptions.SaveOptionsToFile(AProject: TFPDocProject; ++ const AFileName: String); + + Var + XML : TXMLDocument; diff --git a/fpc.spec b/fpc.spec index ab460c3..47ce443 100644 --- a/fpc.spec +++ b/fpc.spec @@ -6,8 +6,8 @@ %endif Name: fpc -Version: 3.0.0 -Release: 6%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: Free Pascal Compiler Group: Development/Languages @@ -29,9 +29,8 @@ Source0: ftp://ftp.freepascal.org/pub/fpc/dist/%{version}/source/fpcbuild Source2: fpc.cft Source3: fppkg.cfg Source4: default.cft -Patch0: fpcdocs-3.0.0-r1260.patch -Patch1: fpc-3.0.0-r32374.patch -Patch2: fpc-3.0.0-r32527.patch +Patch0: fpc-3.0.2-r32374.patch +Patch1: fpc-3.0.2-r34749.patch Requires: gpm, ncurses, binutils %if ! 0%{?bootstrap} @@ -102,7 +101,6 @@ automatical-code generation purposes. %endif %patch0 %patch1 -%patch2 %build # The source-files: @@ -121,7 +119,8 @@ STARTPP=%{ppcname} cd fpcsrc NEWPP=`pwd`/compiler/%{ppcname} DATA2INC=`pwd`/utils/data2inc -make %{?_smp_mflags} compiler_cycle FPC=${STARTPP} OPT='%{fpcopt} %{fpcdebugopt}' +# FIXME: -j1 as there is a race on armv7hl - seen on "missing" `prt0.o' and 'dllprt0.o'. +make -j1 compiler_cycle FPC=${STARTPP} OPT='%{fpcopt} %{fpcdebugopt}' make %{?_smp_mflags} rtl_clean rtl%{smart} FPC=${NEWPP} OPT='%{fpcopt}' make %{?_smp_mflags} packages%{smart} FPC=${NEWPP} OPT='%{fpcopt}' make %{?_smp_mflags} ide_all FPC=${NEWPP} OPT='%{fpcopt} %{fpcdebugopt}' @@ -212,6 +211,10 @@ rm -rf %{buildroot}/usr/lib/%{name}/lexyacc %changelog +* Sat Mar 18 2017 Joost van der Sluis - 3.0.2-1 +- Upgrade to upstream release 3.0.2. +- Attempt to fix race-problem during compiler-compilation on ARM + * Fri Feb 10 2017 Fedora Release Engineering - 3.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/fpcdocs-3.0.0-r1260.patch b/fpcdocs-3.0.0-r1260.patch deleted file mode 100644 index 59a5ede..0000000 --- a/fpcdocs-3.0.0-r1260.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: fpcdocs/Makefile -=================================================================== ---- fpcdocs/Makefile (revision 1259) -+++ fpcdocs/Makefile (working copy) -@@ -2672,9 +2672,9 @@ - $(RTLMAKESKEL) $(RTLCHARACTER) --output=character.new.xml - ./cleanxml $(RTLNEWXML) - rtl.inc: $(RTLXML) -- $(FPDOC) --output=rtl.inc --project=rtl-project.xml --format=latex -+ $(FPDOC) --base-input-dir=$(FPCSRCDIR)/rtl --output=rtl.inc --project=rtl-project.xml --format=latex - fcl.inc: $(FCLXML) -- $(FPDOC) --output=fcl.inc --project=fcl-project.xml --format=latex -+ $(FPDOC) --base-input-dir=$(FPCSRCDIR)/packages --output=fcl.inc --project=fcl-project.xml --format=latex - fclres.inc: $(FCLRESXML) - $(FPDOC) --output=fclres.inc $(FCLRESOPTS) --format=latex - RTFFILES = $(addsuffix .rtf,$(RTFS)) -Index: fpcdocs/Makefile.fpc -=================================================================== ---- fpcdocs/Makefile.fpc (revision 1258) -+++ fpcdocs/Makefile.fpc (working copy) -@@ -777,10 +777,10 @@ - ##################################################################### - - rtl.inc: $(RTLXML) -- $(FPDOC) --output=rtl.inc --project=rtl-project.xml --format=latex -+ $(FPDOC) --base-input-dir=$(FPCSRCDIR)/rtl --output=rtl.inc --project=rtl-project.xml --format=latex - - fcl.inc: $(FCLXML) -- $(FPDOC) --output=fcl.inc --project=fcl-project.xml --format=latex -+ $(FPDOC) --base-input-dir=$(FPCSRCDIR)/packages --output=fcl.inc --project=fcl-project.xml --format=latex - - fclres.inc: $(FCLRESXML) - $(FPDOC) --output=fclres.inc $(FCLRESOPTS) --format=latex diff --git a/sources b/sources index acca446..7f4359e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (fpcbuild-3.0.0.tar.gz) = d010cdc2dd2d4c6efe67cf005d0babb00c2a8ae70942c8b838bb690153ad72e52c0d7198eded7bbde8c77e64d28b2d7f5a220fdcd6117e5991cd11a24369d1f1 -SHA512 (fpc-3.0.0-bin-ppc64.tar.gz) = 79e18684f1cc25e41b211df7006369505354f6608f80c315fb4a38ecc3123c2c72d8d37bd2d2f9c5070a84709b0334889427c08c873f11c5716f37c5cccdad98 +SHA512 (fpcbuild-3.0.2.tar.gz) = dfa4865d8166b7903914ac101e48bae9761671a77e37cbfd54c2ee8eb6b2ba0e5f3ac4b55867a2ead79499dbae68cc785db531385c5b77d533945c644a2f6fe6