From ce4759ef178894cea618ecc9a9cb4c9db0abb491 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Tue, 12 Mar 2013 09:22:40 +1100
Subject: [PATCH] Add build set patch option support.

---
 source-builder/config/gcc-4.5-1.cfg | 40 ++++++++++++++---------------
 source-builder/config/gcc-4.8-1.cfg | 40 ++++++++++++++---------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/source-builder/config/gcc-4.5-1.cfg b/source-builder/config/gcc-4.5-1.cfg
index 91f65d3..fc46411 100644
--- a/source-builder/config/gcc-4.5-1.cfg
+++ b/source-builder/config/gcc-4.5-1.cfg
@@ -61,31 +61,31 @@ Source22: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
   %setup -q -c -n %{name}-%{version}
   %{?source1:%setup -q -D -T -n %{name}-%{version} -a1}
   cd gcc-%{gcc_version}
-  %{?patch0:%patch0 -p1}
-  %{?patch1:%patch1 -p1}
-  %{?patch2:%patch2 -p1}
-  %{?patch3:%patch3 -p1}
-  %{?patch4:%patch4 -p1}
-  %{?patch5:%patch5 -p1}
-  %{?patch6:%patch6 -p1}
-  %{?patch7:%patch7 -p1}
-  %{?patch8:%patch8 -p1}
-  %{?patch9:%patch9 -p1}
+  %{?patch0:%patch0 %{?patch0_opts:%{patch0_opts}}%{!?patch0_opts:-p1}}
+  %{?patch1:%patch1 %{?patch1_opts:%{patch1_opts}}%{!?patch1_opts:-p1}}
+  %{?patch2:%patch2 %{?patch2_opts:%{patch2_opts}}%{!?patch2_opts:-p1}}
+  %{?patch3:%patch3 %{?patch3_opts:%{patch3_opts}}%{!?patch3_opts:-p1}}
+  %{?patch4:%patch4 %{?patch4_opts:%{patch4_opts}}%{!?patch4_opts:-p1}}
+  %{?patch5:%patch5 %{?patch5_opts:%{patch5_opts}}%{!?patch5_opts:-p1}}
+  %{?patch6:%patch6 %{?patch6_opts:%{patch6_opts}}%{!?patch6_opts:-p1}}
+  %{?patch7:%patch7 %{?patch7_opts:%{patch7_opts}}%{!?patch7_opts:-p1}}
+  %{?patch8:%patch8 %{?patch8_opts:%{patch8_opts}}%{!?patch8_opts:-p1}}
+  %{?patch9:%patch9 %{?patch9_opts:%{patch9_opts}}%{!?patch9_opts:-p1}}
   cd ..
 
   # newlib
   %setup -q -D -T -n %{name}-%{version} -a10
   cd newlib-%{newlib_version}
-  %{?patch10:%patch10 -p1}
-  %{?patch11:%patch11 -p1}
-  %{?patch12:%patch12 -p1}
-  %{?patch13:%patch13 -p1}
-  %{?patch14:%patch14 -p1}
-  %{?patch15:%patch15 -p1}
-  %{?patch16:%patch16 -p1}
-  %{?patch17:%patch17 -p1}
-  %{?patch18:%patch18 -p1}
-  %{?patch19:%patch19 -p1}
+  %{?patch10:%patch10 %{?patch10_opts:%{patch10_opts}}%{!?patch10_opts:-p1}}
+  %{?patch11:%patch11 %{?patch11_opts:%{patch11_opts}}%{!?patch11_opts:-p1}}
+  %{?patch12:%patch12 %{?patch12_opts:%{patch12_opts}}%{!?patch12_opts:-p1}}
+  %{?patch13:%patch13 %{?patch13_opts:%{patch13_opts}}%{!?patch13_opts:-p1}}
+  %{?patch14:%patch14 %{?patch14_opts:%{patch14_opts}}%{!?patch14_opts:-p1}}
+  %{?patch15:%patch15 %{?patch15_opts:%{patch15_opts}}%{!?patch15_opts:-p1}}
+  %{?patch16:%patch16 %{?patch16_opts:%{patch16_opts}}%{!?patch16_opts:-p1}}
+  %{?patch17:%patch17 %{?patch17_opts:%{patch17_opts}}%{!?patch17_opts:-p1}}
+  %{?patch18:%patch18 %{?patch18_opts:%{patch18_opts}}%{!?patch18_opts:-p1}}
+  %{?patch19:%patch19 %{?patch19_opts:%{patch19_opts}}%{!?patch19_opts:-p1}}
   cd ..
 
   # Link newlib into the gcc source tree
diff --git a/source-builder/config/gcc-4.8-1.cfg b/source-builder/config/gcc-4.8-1.cfg
index 0df295f..ded7734 100644
--- a/source-builder/config/gcc-4.8-1.cfg
+++ b/source-builder/config/gcc-4.8-1.cfg
@@ -70,31 +70,31 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
   %setup -q -c -n %{name}-%{version}
   %{?source1:%setup -q -D -T -n %{name}-%{version} -a1}
   cd gcc-%{gcc_version}
-  %{?patch0:%patch0 -p1}
-  %{?patch1:%patch1 -p1}
-  %{?patch2:%patch2 -p1}
-  %{?patch3:%patch3 -p1}
-  %{?patch4:%patch4 -p1}
-  %{?patch5:%patch5 -p1}
-  %{?patch6:%patch6 -p1}
-  %{?patch7:%patch7 -p1}
-  %{?patch8:%patch8 -p1}
-  %{?patch9:%patch9 -p1}
+  %{?patch0:%patch0 %{?patch0_opts:%{patch0_opts}}%{!?patch0_opts:-p1}}
+  %{?patch1:%patch1 %{?patch1_opts:%{patch1_opts}}%{!?patch1_opts:-p1}}
+  %{?patch2:%patch2 %{?patch2_opts:%{patch2_opts}}%{!?patch2_opts:-p1}}
+  %{?patch3:%patch3 %{?patch3_opts:%{patch3_opts}}%{!?patch3_opts:-p1}}
+  %{?patch4:%patch4 %{?patch4_opts:%{patch4_opts}}%{!?patch4_opts:-p1}}
+  %{?patch5:%patch5 %{?patch5_opts:%{patch5_opts}}%{!?patch5_opts:-p1}}
+  %{?patch6:%patch6 %{?patch6_opts:%{patch6_opts}}%{!?patch6_opts:-p1}}
+  %{?patch7:%patch7 %{?patch7_opts:%{patch7_opts}}%{!?patch7_opts:-p1}}
+  %{?patch8:%patch8 %{?patch8_opts:%{patch8_opts}}%{!?patch8_opts:-p1}}
+  %{?patch9:%patch9 %{?patch9_opts:%{patch9_opts}}%{!?patch9_opts:-p1}}
   cd ..
 
   # newlib
   %setup -q -D -T -n %{name}-%{version} -a10
   cd newlib-%{newlib_version}
-  %{?patch10:%patch10 -p1}
-  %{?patch11:%patch11 -p1}
-  %{?patch12:%patch12 -p1}
-  %{?patch13:%patch13 -p1}
-  %{?patch14:%patch14 -p1}
-  %{?patch15:%patch15 -p1}
-  %{?patch16:%patch16 -p1}
-  %{?patch17:%patch17 -p1}
-  %{?patch18:%patch18 -p1}
-  %{?patch19:%patch19 -p1}
+  %{?patch10:%patch10 %{?patch10_opts:%{patch10_opts}}%{!?patch10_opts:-p1}}
+  %{?patch11:%patch11 %{?patch11_opts:%{patch11_opts}}%{!?patch11_opts:-p1}}
+  %{?patch12:%patch12 %{?patch12_opts:%{patch12_opts}}%{!?patch12_opts:-p1}}
+  %{?patch13:%patch13 %{?patch13_opts:%{patch13_opts}}%{!?patch13_opts:-p1}}
+  %{?patch14:%patch14 %{?patch14_opts:%{patch14_opts}}%{!?patch14_opts:-p1}}
+  %{?patch15:%patch15 %{?patch15_opts:%{patch15_opts}}%{!?patch15_opts:-p1}}
+  %{?patch16:%patch16 %{?patch16_opts:%{patch16_opts}}%{!?patch16_opts:-p1}}
+  %{?patch17:%patch17 %{?patch17_opts:%{patch17_opts}}%{!?patch17_opts:-p1}}
+  %{?patch18:%patch18 %{?patch18_opts:%{patch18_opts}}%{!?patch18_opts:-p1}}
+  %{?patch19:%patch19 %{?patch19_opts:%{patch19_opts}}%{!?patch19_opts:-p1}}
   cd ..
 
   # Link newlib into the gcc source tree