From ebf8a1f0f82b35235c39b67bde9e6acc2d464dee Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Tue, 16 Jul 2013 10:02:41 +1000
Subject: Automtically build the Autotools to bootstrap RTEMS.

This changes adds support to build the autotools if the host installed
version is not a suitable version. Autoconf and automake have hard coded
references to the install prefix and host tools and this makes it impossible
to relocate, that is use in any path other than the install prefix. To
bootstrap automake you need to first build a suitable autoconf and with that
you can built automake for the install prefix. The other complication is
not referencing the install prefix in the path when building in the RSB.
Having the install prefix in the path can result in strange issues appearing
such as gcc using a new assembler feature not present in an older assember
installed under the install prefix.

The process is to build the autotools using an install prefix to an
internal path inside the RSB temporary path and to use that autoconf
to build the version for the install prefix. The internal install
prefix version is also used to bootstrap RTEMS.
---
 source-builder/config/autoconf-2-1.cfg | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'source-builder/config/autoconf-2-1.cfg')

diff --git a/source-builder/config/autoconf-2-1.cfg b/source-builder/config/autoconf-2-1.cfg
index 51e683d..48fd542 100644
--- a/source-builder/config/autoconf-2-1.cfg
+++ b/source-builder/config/autoconf-2-1.cfg
@@ -31,16 +31,14 @@ VersionControl0: git clone git://git.sv.gnu.org/autoconf
   cd ..
 
 %build
-  if test "%{_internal_autotools}" == "yes"; then
-    export PATH="%{_bindir}:${PATH}"
-  else
-    export PATH=$SB_ORIG_PATH
-  fi
+  %if %{defined _internal_autotools_path}
+    export PATH="%{_internal_autotools_path}/bin:${PATH}"
+  %endif
 
   cd autoconf-%{autoconf_version}
 
   if test "%{_internal_autotools}" == "yes"; then
-    ac_prefix=$SB_TMPPREFIX
+    ac_prefix=%{_internal_autotools_path}
   else
     ac_prefix=%{_prefix}
   fi
@@ -65,11 +63,11 @@ VersionControl0: git clone git://git.sv.gnu.org/autoconf
 
 %install
   export PATH="%{_bindir}:${PATH}"
-  rm -rf $SB_BUILD_ROOT
+  %{__rmdir} $SB_BUILD_ROOT
 
   cd autoconf-%{autoconf_version}
 
-  if "%{_internal_autotools}" == "yes"; then
+  if test "%{_internal_autotools}" == "yes"; then
     %{__make} install
   else
     %{__make} DESTDIR=$SB_BUILD_ROOT install
-- 
cgit v1.2.3