rpms/fpc/devel fpc-2.2.2-samplecfg_32and64bit.patch, 1.2, 1.3 fpc.spec, 1.29, 1.30
Joost van der Sluis
joost at fedoraproject.org
Sun Oct 26 19:24:03 UTC 2008
- Previous message (by thread): rpms/blender/devel .cvsignore, 1.15, 1.16 blender.spec, 1.87, 1.88 sources, 1.20, 1.21
- Next message (by thread): rpms/blender/F-9 blender.spec,1.81,1.82 sources,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: joost
Update of /cvs/pkgs/rpms/fpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28533
Modified Files:
fpc-2.2.2-samplecfg_32and64bit.patch fpc.spec
Log Message:
* Sat Oct 25 2008 Joost van der Sluis <joost at cnoc.nl> 2.2.2-3
- Do not distribute the RTL and packages with debug-info included
- Fix the location of the fpc-binary in the samplecfg script
fpc-2.2.2-samplecfg_32and64bit.patch:
Index: fpc-2.2.2-samplecfg_32and64bit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc-2.2.2-samplecfg_32and64bit.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fpc-2.2.2-samplecfg_32and64bit.patch 13 Aug 2008 20:43:10 -0000 1.2
+++ fpc-2.2.2-samplecfg_32and64bit.patch 26 Oct 2008 19:23:32 -0000 1.3
@@ -1,6 +1,6 @@
Index: fpcsrc/compiler/utils/samplecfg
===================================================================
---- fpcsrc/compiler/utils/samplecfg (revision 11557)
+--- fpcsrc/compiler/utils/samplecfg (version 2.2.2)
+++ fpcsrc/compiler/utils/samplecfg (working copy)
@@ -35,7 +35,7 @@
if [ $# = 0 ]; then
@@ -11,7 +11,16 @@
echo 'confdir = Path to /etc'
exit 1
fi
-@@ -161,7 +161,8 @@
+@@ -45,7 +45,7 @@
+ else
+ sysdir=/etc
+ fi
+-FPCBIN=`dirname "$1"`/../../bin/fpc
++FPCBIN=`dirname "$1"`/bin/fpc
+
+ # Detect if we have write permission in root.
+ if [ -w "$sysdir" ] ; then
+@@ -155,7 +155,8 @@
# set right path to FPC with $fpcversion
@@ -21,7 +30,7 @@
# Write the file
echo Writing sample configuration file to $thefile
-@@ -297,26 +298,48 @@
+@@ -291,26 +292,48 @@
# path to the messagefile, not necessary anymore but can be used to override
# the default language
@@ -39,26 +48,26 @@
--Fu$FPCPATH/units/\$fpctarget/httpd-1.3/
+#IFDEF CPU64
+-Fu$FPCPATH64/units/\$fpctarget/httpd-1.3/
- #ELSE
++#ELSE
+-Fu$FPCPATH32/units/\$fpctarget/httpd-1.3/
+#ENDIF
-+#ELSE
+ #ELSE
#IFDEF FPCAPACHE_2_0
--Fu$FPCPATH/units/\$fpctarget/httpd-2.0
+#IFDEF CPU64
+-Fu$FPCPATH64/units/\$fpctarget/httpd-2.0
++#ELSE
++-Fu$FPCPATH32/units/\$fpctarget/httpd-2.0
++#ENDIF
#ELSE
--Fu$FPCPATH/units/\$fpctarget/httpd-2.2
-+-Fu$FPCPATH32/units/\$fpctarget/httpd-2.0
- #ENDIF
-+#ELSE
+#IFDEF CPU64
+-Fu$FPCPATH64/units/\$fpctarget/httpd-2.2
+#ELSE
+-Fu$FPCPATH32/units/\$fpctarget/httpd-2.2
- #ENDIF
-+#ENDIF
+#ENDIF
+ #ENDIF
+ #ENDIF
# searchpath for units and other system dependent things
--Fu$FPCPATH/units/\$fpctarget
Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- fpc.spec 20 Oct 2008 20:54:45 -0000 1.29
+++ fpc.spec 26 Oct 2008 19:23:32 -0000 1.30
@@ -1,6 +1,6 @@
Name: fpc
Version: 2.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Free Pascal Compiler
Group: Development/Languages
@@ -55,18 +55,16 @@
%ifarch ppc
%define ppcname ppcppc
-%define fpcopt '-k"--build-id -z noexecstack" -gl'
+%define fpcdebugopt -gl
%else
%ifarch x86_64
%define ppcname ppcx64
-%define fpcopt '-k"--build-id -z noexecstack"'
%else
%ifarch ppc64
%define ppcname ppcppc64
-%define fpcopt '-k"--build-id -z noexecstack"'
%else
%define ppcname ppc386
-%define fpcopt '-k"--build-id -z noexecstack" -gl'
+%define fpcdebugopt -gl
%endif
%endif
%endif
@@ -96,15 +94,16 @@
%else
STARTPP=%{ppcname}
%endif
+%define fpcopt -k"--build-id -z noexecstack"
cd fpcsrc
NEWPP=`pwd`/compiler/%{ppcname}
NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
DATA2INC=`pwd`/utils/data2inc
-make compiler_cycle FPC=${STARTPP} OPT=%{fpcopt}
-make rtl_clean rtl%{smart} FPC=${NEWPP} OPT=%{fpcopt}
-make packages%{smart} FPC=${NEWPP} OPT=%{fpcopt}
-make ide_all FPC=${NEWPP} OPT=%{fpcopt}
-make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC} OPT=%{fpcopt}
+make compiler_cycle FPC=${STARTPP} OPT='%{fpcopt} %{fpcdebugopt}'
+make rtl_clean rtl%{smart} FPC=${NEWPP} OPT='%{fpcopt}'
+make packages%{smart} FPC=${NEWPP} OPT='%{fpcopt}'
+make ide_all FPC=${NEWPP} OPT='%{fpcopt} %{fpcdebugopt}'
+make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC} OPT='%{fpcopt} %{fpcdebugopt}'
cd ..
make -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
@@ -180,6 +179,10 @@
%{_datadir}/fpcsrc
%changelog
+* Sat Oct 25 2008 Joost van der Sluis <joost at cnoc.nl> 2.2.2-3
+- Do not distribute the RTL and packages with debug-info included
+- Fix the location of the fpc-binary in the samplecfg script
+
* Sun Oct 19 2008 Joost van der Sluis <joost at cnoc.nl> 2.2.2-2
- Pass -z noexecstack to the linker from within the configuration file fpc.cfg (fpc-bug #11563)
- Added patch to fix fpc-bug #11837 for usage with newer gtk2-versions
- Previous message (by thread): rpms/blender/devel .cvsignore, 1.15, 1.16 blender.spec, 1.87, 1.88 sources, 1.20, 1.21
- Next message (by thread): rpms/blender/F-9 blender.spec,1.81,1.82 sources,1.15,1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list