- Upgrade to upstream release 2.4.2rc1.
This commit is contained in:
Joost van der Sluis
parent
a6e1f4db58
commit
d7cfaeb387
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
fpcbuild-2.4.0.tar.gz
|
||||
/fpcbuild-2.4.2rc1.tar.gz
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
Index: fpcsrc/compiler/utils/samplecfg
|
||||
===================================================================
|
||||
--- fpcsrc/compiler/utils/samplecfg (version 2.2.4)
|
||||
--- fpcsrc/compiler/utils/samplecfg (version 2.4.2)
|
||||
+++ fpcsrc/compiler/utils/samplecfg (working copy)
|
||||
@@ -367,6 +367,11 @@
|
||||
# to perform
|
||||
@@ -379,6 +379,11 @@
|
||||
#endif
|
||||
|
||||
# -----------------------
|
||||
+# Use BuildId by default
|
||||
26
fpc-2.4.2-r15671.patch
Normal file
26
fpc-2.4.2-r15671.patch
Normal file
@ -0,0 +1,26 @@
|
||||
Index: fpcsrc/utils/fpdoc/dwlinear.pp
|
||||
===================================================================
|
||||
--- fpcsrc/utils/fpdoc/dwlinear.pp (revision 15670)
|
||||
+++ fpcsrc/utils/fpdoc/dwlinear.pp (revision 15671)
|
||||
@@ -869,7 +869,9 @@
|
||||
WriteSeeAlso(DocNode);
|
||||
EndProcedure;
|
||||
WriteExample(DocNode);
|
||||
- end;
|
||||
+ end
|
||||
+ else
|
||||
+ EndProcedure;
|
||||
end;
|
||||
end;
|
||||
|
||||
@@ -970,7 +972,9 @@
|
||||
WriteSeeAlso(DocNode);
|
||||
EndProperty;
|
||||
WriteExample(DocNode);
|
||||
- end;
|
||||
+ end
|
||||
+ else
|
||||
+ EndProperty;
|
||||
end;
|
||||
end;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Index: fpcsrc/compiler/utils/samplecfg
|
||||
===================================================================
|
||||
--- fpcsrc/compiler/utils/samplecfg (version 2.2.4)
|
||||
--- fpcsrc/compiler/utils/samplecfg (version 2.4.2)
|
||||
+++ fpcsrc/compiler/utils/samplecfg (working copy)
|
||||
@@ -34,9 +34,10 @@
|
||||
|
||||
@ -21,7 +21,7 @@ Index: fpcsrc/compiler/utils/samplecfg
|
||||
fi
|
||||
-FPCBIN=`dirname "$1"`/../../bin/fpc
|
||||
-FPBIN=`dirname "$1"`/../../bin/fp
|
||||
-sysfpdirbase=`dirname "$1"`/`$FPCBIN -iV`
|
||||
-sysfpdirbase=`dirname "$1"`/`"$FPCBIN" -iV`
|
||||
+FPCBIN="$1"/bin/fpc
|
||||
+FPBIN="$1"/bin/fp
|
||||
+fpctargetproc=`$FPCBIN -iTP`
|
||||
@ -32,13 +32,13 @@ Index: fpcsrc/compiler/utils/samplecfg
|
||||
+ libdir=lib
|
||||
+fi
|
||||
+if [ "$3" ]; then
|
||||
+ sysfpdirbase="$3"/"$libdir"/fpc/`$FPCBIN -iV`
|
||||
+ sysfpdirbase="$3"/"$libdir"/fpc/`"$FPCBIN" -iV`
|
||||
+else
|
||||
+ sysfpdirbase="$1"/"$libdir"/fpc/`$FPCBIN -iV`
|
||||
+ sysfpdirbase="$1"/"$libdir"/fpc/`"$FPCBIN" -iV`
|
||||
+fi
|
||||
sysfpdirbase2=$sysfpdirbase/ide
|
||||
sysfpdir=$sysfpdirbase2/text
|
||||
fpctargetos=`$FPCBIN -iTO`
|
||||
fpctargetos=`"$FPCBIN" -iTO`
|
||||
@@ -223,7 +236,9 @@
|
||||
|
||||
|
||||
@ -50,7 +50,7 @@ Index: fpcsrc/compiler/utils/samplecfg
|
||||
|
||||
# Write (.)fpc.cfg
|
||||
echo Writing sample configuration file to $fpccfgfile
|
||||
@@ -359,26 +374,48 @@
|
||||
@@ -372,23 +386,45 @@
|
||||
|
||||
# path to the messagefile, not necessary anymore but can be used to override
|
||||
# the default language
|
||||
@ -61,9 +61,6 @@ Index: fpcsrc/compiler/utils/samplecfg
|
||||
+#-Fr$FPCPATH64/msg/errore.msg
|
||||
+#-Fr$FPCPATH64/msg/errorn.msg
|
||||
|
||||
# searchpath for includefiles
|
||||
#-Fi/pp/inc;/pp/rtl/inc
|
||||
|
||||
#IFDEF FPCAPACHE_1_3
|
||||
--Fu$FPCPATH/units/\$fpctarget/httpd13/
|
||||
+#IFDEF CPU64
|
||||
21
fpc.spec
21
fpc.spec
@ -1,18 +1,20 @@
|
||||
Name: fpc
|
||||
Version: 2.4.0
|
||||
Release: 1%{?dist}
|
||||
Version: 2.4.2
|
||||
Release: 0.1.rc1%{?dist}
|
||||
Summary: Free Pascal Compiler
|
||||
|
||||
Group: Development/Languages
|
||||
License: GPLv2+ and LGPLv2+ with exceptions
|
||||
URL: http://www.freepascal.org/
|
||||
Source0: ftp://ftp.freepascal.org/pub/fpc/dist/${version}/source/fpcbuild-%{version}.tar.gz
|
||||
Source0: ftp://ftp.freepascal.org/pub/fpc/dist/${version}/source/fpcbuild-%{version}rc1.tar.gz
|
||||
# This is only needed when useprebuiltcompiler is defined.
|
||||
# But it's not in an 'if defined' block, since the file has to be included in the srpm
|
||||
# Thus you should enable this line when useprebuildcompiler is defined for any target
|
||||
# Source1: http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
|
||||
Patch0: fpc-2.2.4-samplecfg_32and64bit.patch
|
||||
Patch1: fpc-2.2.4-build-id.patch
|
||||
Patch0: fpc-2.4.2-samplecfg_32and64bit.patch
|
||||
Patch1: fpc-2.4.2-build-id.patch
|
||||
Patch2: fpc-2.4.2-r15671.patch
|
||||
Patch3: fpc-2.4.2-r16198.patch
|
||||
|
||||
Requires: gpm, ncurses, binutils
|
||||
%if ! %{defined useprebuiltcompiler}
|
||||
@ -67,12 +69,14 @@ automatical-code generation purposes.
|
||||
|
||||
%prep
|
||||
%if %{defined useprebuiltcompiler}
|
||||
%setup -a1 -n fpcbuild-%{version} -q
|
||||
%setup -a1 -n fpcbuild-%{version}rc1 -q
|
||||
%else
|
||||
%setup -n fpcbuild-%{version} -q
|
||||
%setup -n fpcbuild-%{version}rc1 -q
|
||||
%endif
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
|
||||
%build
|
||||
# The source-files:
|
||||
@ -173,6 +177,9 @@ rm -rf %{buildroot}
|
||||
%{_datadir}/fpcsrc
|
||||
|
||||
%changelog
|
||||
* Sat Oct 23 2010 Joost van der Sluis <joost@cnoc.nl> - 2.4.2-0.1.rc1
|
||||
- Upgrade to upstream release 2.4.2rc1.
|
||||
|
||||
* Wed May 5 2010 Joost van der Sluis <joost@cnoc.nl> - 2.4.0-1.fc14
|
||||
- Drop fpc-2.2.4-stackexecute.patch since bug was fixed in 2.4.0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user