rpms/fpc/devel fpc-2.2.4-build-id.patch, NONE, 1.1 fpc-2.2.4-samplecfg_32and64bit.patch, NONE, 1.1 fpc-2.2.4-stackexecute.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 fpc.spec, 1.31, 1.32 sources, 1.12, 1.13 fpc-2.2.2-build-id.patch, 1.1, NONE fpc-2.2.2-fpcdocs.patch, 1.1, NONE fpc-2.2.2-gtk2-r11651.patch, 1.1, NONE fpc-2.2.2-samplecfg_32and64bit.patch, 1.3, NONE fpc-2.2.2-stackexecute.patch, 1.1, NONE

Sun Apr 12 19:47:35 UTC 2009

Author: joost

Update of /cvs/pkgs/rpms/fpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27928

Modified Files:
	.cvsignore fpc.spec sources 
Added Files:
	fpc-2.2.4-build-id.patch fpc-2.2.4-samplecfg_32and64bit.patch 
	fpc-2.2.4-stackexecute.patch 
Removed Files:
	fpc-2.2.2-build-id.patch fpc-2.2.2-fpcdocs.patch 
	fpc-2.2.2-gtk2-r11651.patch 
	fpc-2.2.2-samplecfg_32and64bit.patch 
	fpc-2.2.2-stackexecute.patch 
Log Message:
* Sun Apr 12 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-1
- Updated to version 2.2.4


fpc-2.2.4-build-id.patch:

--- NEW FILE fpc-2.2.4-build-id.patch ---
Index: fpcsrc/compiler/utils/samplecfg
===================================================================
--- fpcsrc/compiler/utils/samplecfg	(version 2.2.4)
+++ fpcsrc/compiler/utils/samplecfg	(working copy)
@@ -360,6 +360,11 @@
 # to perform
 
 # -----------------------
+# Use BuildId by default
+# -----------------------
+-k--build-id
+
+# -----------------------
 # Set Filenames and Paths
 # -----------------------
 

fpc-2.2.4-samplecfg_32and64bit.patch:

--- NEW FILE fpc-2.2.4-samplecfg_32and64bit.patch ---
Index: fpcsrc/compiler/utils/samplecfg
===================================================================
--- fpcsrc/compiler/utils/samplecfg	(version 2.2.4)
+++ fpcsrc/compiler/utils/samplecfg	(working copy)
@@ -17,7 +17,7 @@
 
 setgccdirarch() {
 # First argument is fpc define for CPU type; remaining args are passed to gcc to set corresponding architecture
-FPCDEFINE=$1
+FPCDEFINE="$1"/"$libdir"/fpc
 shift
 setgccdir $@
 
@@ -35,7 +35,7 @@
 if [ $# = 0 ]; then
   echo 'Usage :'
   echo 'samplecfg fpcdir confdir'
-  echo 'fpcdir = Path where FPC is installed'
+  echo 'fpcdir = Prefix where FPC is installed (/usr/., /usr/local/.)'
   echo 'confdir = Path to /etc'
   exit 1
 fi
@@ -45,9 +45,16 @@
 else
   sysdir=/etc
 fi
-FPCBIN=`dirname "$1"`/../../bin/fpc
-FPBIN=`dirname "$1"`/../../bin/fp
-sysfpdirbase=`dirname "$1"`/`$FPCBIN -iV`
+FPCBIN="$1"/bin/fpc
+FPBIN="$1"/bin/fp
+fpctargetproc=`$FPCBIN -iTP`
+echo "$fpctargetproc"
+if [ "$fpctargetproc" = "x86_64" -o "$fpctargetproc" = "powerpc64" ]; then
+  libdir=lib64
+else
+  libdir=lib
+fi
+sysfpdirbase="$1"/"$libdir"/fpc/`$FPCBIN -iV`
 sysfpdirbase2=$sysfpdirbase/ide
 sysfpdir=$sysfpdirbase2/text
 fpctargetos=`$FPCBIN -iTO`
@@ -223,7 +230,8 @@
 
 
 # set right path to FPC with $fpcversion
-FPCPATH=`dirname "$1"`/\$fpcversion
+FPCPATH32="$1"/lib/fpc/\$fpcversion
+FPCPATH64="$1"/lib64/fpc/\$fpcversion
 
 # Write (.)fpc.cfg
 echo Writing sample configuration file to $fpccfgfile
@@ -359,26 +367,48 @@
 
 # path to the messagefile, not necessary anymore but can be used to override
 # the default language
-#-Fr$FPCPATH/msg/errore.msg
-#-Fr$FPCPATH/msg/errorn.msg
+#-Fr$FPCPATH32/msg/errore.msg
+#-Fr$FPCPATH32/msg/errorn.msg
+#-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
+-Fu$FPCPATH64/units/\$fpctarget/httpd13/
+#ELSE
+-Fu$FPCPATH32/units/\$fpctarget/httpd13/
+#ENDIF
 #ELSE
 #IFDEF FPCAPACHE_2_0
--Fu$FPCPATH/units/\$fpctarget/httpd20
+#IFDEF CPU64
+-Fu$FPCPATH64/units/\$fpctarget/httpd20
+#ELSE
+-Fu$FPCPATH32/units/\$fpctarget/httpd20
+#ENDIF
+#ELSE
+#IFDEF CPU64
+-Fu$FPCPATH64/units/\$fpctarget/httpd22
 #ELSE
--Fu$FPCPATH/units/\$fpctarget/httpd22
+-Fu$FPCPATH32/units/\$fpctarget/httpd22
+#ENDIF
 #ENDIF
 #ENDIF
 
 # searchpath for units and other system dependent things
--Fu$FPCPATH/units/\$fpctarget
--Fu$FPCPATH/units/\$fpctarget/*
--Fu$FPCPATH/units/\$fpctarget/rtl
+#IFDEF CPU64
+# 64-bits
+-Fu$FPCPATH64/units/\$fpctarget
+-Fu$FPCPATH64/units/\$fpctarget/*
+-Fu$FPCPATH64/units/\$fpctarget/rtl
+#ELSE
+# 32-bits
+-Fu$FPCPATH32/units/\$fpctarget
+-Fu$FPCPATH32/units/\$fpctarget/*
+-Fu$FPCPATH32/units/\$fpctarget/rtl
+#ENDIF
 #-Fu~/fpc/packages/base/*/units/$fpctarget;~/fpc/fcl/units/$fpctarget;~/fpc/rtl/units/$fpctarget
 
 # searchpath for libraries

fpc-2.2.4-stackexecute.patch:

--- NEW FILE fpc-2.2.4-stackexecute.patch ---
Index: fpcsrc/compiler/utils/samplecfg
===================================================================
--- fpcsrc/compiler/utils/samplecfg	(version 2.2.4)
+++ fpcsrc/compiler/utils/samplecfg	(working copy)
@@ -365,6 +365,11 @@
 -k--build-id
 
 # -----------------------
+# Do not mark executables as requiring an executable stack (fpc-bug #11563)
+# -----------------------
+-k-z noexecstack
+
+# -----------------------
 # Set Filenames and Paths
 # -----------------------
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Aug 2008 20:43:10 -0000	1.11
+++ .cvsignore	12 Apr 2009 19:47:03 -0000	1.12
@@ -1 +1 @@
-fpcbuild-2.2.2.tar.gz
+fpcbuild-2.2.4.tar.gz


Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fpc.spec	24 Feb 2009 18:04:11 -0000	1.31
+++ fpc.spec	12 Apr 2009 19:47:04 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           fpc
-Version:        2.2.2
-Release:        4%{?dist}
+Version:        2.2.4
+Release:        1%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -13,16 +13,14 @@
 # Source1:        http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
 Patch0:         %{name}-%{version}-samplecfg_32and64bit.patch
 Patch1:         %{name}-%{version}-build-id.patch
-Patch2:         %{name}-%{version}-fpcdocs.patch
-Patch3:         %{name}-%{version}-stackexecute.patch
-Patch4:         %{name}-%{version}-gtk2-r11651.patch
+Patch2:         %{name}-%{version}-stackexecute.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       gpm, glibc, ncurses, binutils
 %if ! %{defined useprebuiltcompiler}
 BuildRequires:  fpc
 %endif
-BuildRequires:  tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
+BuildRequires:  tetex, tetex-latex, tetex-fonts, binutils, glibc-devel
 
 %description
 
@@ -78,8 +76,6 @@
 %patch0
 %patch1
 %patch2
-%patch3
-%patch4
 
 %build
 # The source-files:
@@ -179,6 +175,9 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Sun Apr 12 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-1
+- Updated to version 2.2.4
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Aug 2008 20:43:10 -0000	1.12
+++ sources	12 Apr 2009 19:47:04 -0000	1.13
@@ -1 +1 @@
-ec3d463ec9859da4122e9edfa2ab992d  fpcbuild-2.2.2.tar.gz
+20bb9a4a9f1449e2249c80d7aba7c245  fpcbuild-2.2.4.tar.gz


--- fpc-2.2.2-build-id.patch DELETED ---


--- fpc-2.2.2-fpcdocs.patch DELETED ---


--- fpc-2.2.2-gtk2-r11651.patch DELETED ---


--- fpc-2.2.2-samplecfg_32and64bit.patch DELETED ---


--- fpc-2.2.2-stackexecute.patch DELETED ---


