Browse Source

make sure bounds and spp are not used at the same time and make sure the build terminated if the spp patching failed

Ralf S. Engelschall 22 years ago
parent
commit
795b2642b6
1 changed files with 6 additions and 1 deletions
  1. 6 1
      gcc/gcc.spec

+ 6 - 1
gcc/gcc.spec

@@ -50,6 +50,11 @@ Release:      20030702
 %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 @@ Provides:     gcc = %{version}-%{release}
 %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" \