OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Jul-2003 10:14:42
Branch: HEAD Handle: 2003070209144200
Modified files:
openpkg-src/gcc gcc.spec
Log:
make sure bounds and spp are not used at the same time and make sure
the build terminated if the spp patching failed
Summary:
Revision Changes Path
1.59 +6 -1 openpkg-src/gcc/gcc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.58 -r1.59 gcc.spec
--- openpkg-src/gcc/gcc.spec 2 Jul 2003 07:31:13 -0000 1.58
+++ openpkg-src/gcc/gcc.spec 2 Jul 2003 08:14:42 -0000 1.59
@@ -50,6 +50,11 @@
%option with_spp no
%option with_gcc no
+# options sanity check
+%if "%{with_bounds}" == "yes" && "%{with_spp}" == "yes"
+RPM ERROR: options with_bounds and with_ssp conflict
+%endif
+
# list of sources
Source0:
ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
Patch0: gcc.patch
@@ -84,7 +89,7 @@
%if "%{with_spp}" == "yes"
( cd gcc
%{l_gzip} -d -c %{SOURCE protector-%{version}-%{V_spp}.tar.gz} | %{l_tar} xf -
- %{l_patch} -p1 <protector.dif )
+ %{l_patch} -p1 <protector.dif ) || exit $?
%endif
%{l_shtool} subst -v -s \
-e "s;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
