From d758ab9adc741d313aaa118d6deeac62c553ce85 Mon Sep 17 00:00:00 2001
From: Hesham ALMatary <heshamelmatary@gmail.com>
Date: Mon, 4 May 2015 12:44:52 +0100
Subject: Modify GNU's common backend configuration files to build from
 external sources

---
 source-builder/config/binutils-2-1.cfg | 6 ++++--
 source-builder/config/gcc-common-1.cfg | 7 +++++--
 source-builder/config/gdb-7-1.cfg      | 6 ++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/source-builder/config/binutils-2-1.cfg b/source-builder/config/binutils-2-1.cfg
index c74a2c7..397dea5 100644
--- a/source-builder/config/binutils-2-1.cfg
+++ b/source-builder/config/binutils-2-1.cfg
@@ -37,8 +37,10 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 %prep
   build_top=$(pwd)
 
-  source_dir_binutils="binutils-%{binutils_version}"
-  %source setup binutils -q -n binutils-%{binutils_version}
+  binutils_source=%{?binutils_external:%{binutils_expand_name}}%{!?binutils_external:"binutils-%{binutils_version}"}
+
+  source_dir_binutils=${binutils_source}
+  %source setup binutils -q -n ${binutils_source}
   %patch setup binutils -p1
 
   cd ${build_top}
diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg
index dd0cf4c..975318c 100644
--- a/source-builder/config/gcc-common-1.cfg
+++ b/source-builder/config/gcc-common-1.cfg
@@ -40,9 +40,12 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
   # target location and 'cd ..' fails.
   build_top=$(pwd)
 
+  gcc_source=%{?gcc_external:%{gcc_expand_name}}%{!?gcc_external:"gcc-%{gcc_version}"}
+
   # gcc and optional the g++ core if separate packages
-  source_dir_gcc="gcc-%{gcc_version}"
-  %source setup gcc -q -n gcc-%{gcc_version}
+  source_dir_gcc=${gcc_source}
+  %source setup gcc -q -n ${gcc_source}
+
   %patch setup gcc -p1
   cd ${build_top}
 
diff --git a/source-builder/config/gdb-7-1.cfg b/source-builder/config/gdb-7-1.cfg
index 6e84375..90a1f5a 100644
--- a/source-builder/config/gdb-7-1.cfg
+++ b/source-builder/config/gdb-7-1.cfg
@@ -66,8 +66,10 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 %prep
   build_top=$(pwd)
 
-  source_dir_gdb="gdb-%{gdb_version}"
-  %source setup gdb -q -n gdb-%{gdb_version}
+  gdb_source=%{?gdb_external:%{gdb_expand_name}}%{!?gdb_external:"gdb-%{gdb_version}"}
+
+  source_dir_gdb=${gdb_source}
+  %source setup gdb -q -n ${gdb_source}
   %patch setup gdb -p1
 
   cd ${build_top}
-- 
cgit v1.2.3