From a77f784f782141405e7874d12f05bb9ed17430bf Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Wed, 31 Oct 2012 22:34:45 +1100
Subject: [PATCH] Fix the TB_ environment variables.

---
 config/autoconf-2-1.cfg |  6 +++---
 config/automake-1-1.cfg |  6 +++---
 config/binutils-2-1.cfg | 32 ++++++++++++++++----------------
 config/expat-2-1.cfg    |  6 +++---
 config/gcc-4.6-1.cfg    | 16 ++++++++--------
 config/gdb-7-1.cfg      | 12 ++++++------
 config/libusb-1-1.cfg   |  6 +++---
 7 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/config/autoconf-2-1.cfg b/config/autoconf-2-1.cfg
index 8cf36d1..8843891 100644
--- a/config/autoconf-2-1.cfg
+++ b/config/autoconf-2-1.cfg
@@ -35,12 +35,12 @@ cd ..
 %if "%{_build}" != "%{_host}"
   CFLAGS_FOR_BUILD="-g -O2 -Wall" \
 %endif
-  CFLAGS="$TB_OPT_FLAGS" \
+  CFLAGS="$SB_OPT_FLAGS" \
   ./configure \
     --build=%{_build} --host=%{_host} \
     --verbose --disable-nls \
     --without-included-gettext \
-    --prefix=$TB_TMPPREFIX
+    --prefix=$SB_TMPPREFIX
 
   %{__make} %{?_smp_mflags} all
 
@@ -48,7 +48,7 @@ cd ..
 
 %install
   export PATH="%{_bindir}:${PATH}"
-  rm -rf $TB_BUILD_ROOT
+  rm -rf $SB_BUILD_ROOT
 
   cd autoconf-%{autoconf_version}
   %{__make} install
diff --git a/config/automake-1-1.cfg b/config/automake-1-1.cfg
index a53ff9a..b1c9368 100644
--- a/config/automake-1-1.cfg
+++ b/config/automake-1-1.cfg
@@ -36,12 +36,12 @@ cd ..
 %if "%{_build}" != "%{_host}"
   CFLAGS_FOR_BUILD="-g -O2 -Wall" \
 %endif
-  CFLAGS="$TB_OPT_FLAGS" \
+  CFLAGS="$SB_OPT_FLAGS" \
   ./configure \
     --build=%{_build} --host=%{_host} \
     --verbose --disable-nls \
     --without-included-gettext \
-    --prefix=$TB_TMPPREFIX
+    --prefix=$SB_TMPPREFIX
 
   %{__make} %{?_smp_mflags} all
 
@@ -49,7 +49,7 @@ cd ..
 
 %install
   export PATH="%{_bindir}:${PATH}"
-  rm -rf $TB_BUILD_ROOT
+  rm -rf $SB_BUILD_ROOT
 
   cd automake-%{automake_version}
   %{__make} install
diff --git a/config/binutils-2-1.cfg b/config/binutils-2-1.cfg
index fdeae97..99f0141 100644
--- a/config/binutils-2-1.cfg
+++ b/config/binutils-2-1.cfg
@@ -34,7 +34,7 @@ cd ..
 %if "%{_build}" != "%{_host}"
   CFLAGS_FOR_BUILD="-g -O2 -Wall" \
 %endif
-  CFLAGS="$TB_OPT_FLAGS" \
+  CFLAGS="$SB_OPT_FLAGS" \
   ../binutils-%{binutils_version}/configure \
     --build=%{_build} --host=%{_host} \
     --target=%{_target} \
@@ -52,35 +52,35 @@ cd ..
 
 %install
   export PATH="%{_bindir}:${PATH}"
-  rm -rf $TB_BUILD_ROOT
+  rm -rf $SB_BUILD_ROOT
 
   cd build
-  %{__make} DESTDIR=$TB_BUILD_ROOT install
+  %{__make} DESTDIR=$SB_BUILD_ROOT install
 
   # Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $TB_BUILD_ROOT%{_infodir}/configure.info*
+  rm -rf $SB_BUILD_ROOT%{_infodir}/configure.info*
 
-  rm -f $TB_BUILD_ROOT%{_infodir}/dir
-  touch $TB_BUILD_ROOT%{_infodir}/dir
+  rm -f $SB_BUILD_ROOT%{_infodir}/dir
+  touch $SB_BUILD_ROOT%{_infodir}/dir
 
   # binutils does not install share/locale, however it uses it
-  mkdir -p $TB_BUILD_ROOT%{_prefix}/share/locale
+  mkdir -p $SB_BUILD_ROOT%{_prefix}/share/locale
 
   # We don't ship host files
-  rm -f ${TB_BUILD_ROOT}%{_libdir}/libiberty*
+  rm -f ${SB_BUILD_ROOT}%{_libdir}/libiberty*
 
   # manpages without corresponding tools
-  if test ! -f ${TB_BUILD_ROOT}%{_bindir}/%{_target}-dlltool%{_exeext}; then
-    rm -f ${TB_BUILD_ROOT}%{_mandir}/man1/%{_target}-dlltool*
+  if test ! -f ${SB_BUILD_ROOT}%{_bindir}/%{_target}-dlltool%{_exeext}; then
+    rm -f ${SB_BUILD_ROOT}%{_mandir}/man1/%{_target}-dlltool*
   fi
-  if test ! -f ${TB_BUILD_ROOT}%{_bindir}/%{_target}-nlmconv%{_exeext}; then
-    rm -f ${TB_BUILD_ROOT}%{_mandir}/man1/%{_target}-nlmconv*
+  if test ! -f ${SB_BUILD_ROOT}%{_bindir}/%{_target}-nlmconv%{_exeext}; then
+    rm -f ${SB_BUILD_ROOT}%{_mandir}/man1/%{_target}-nlmconv*
   fi
-  if test ! -f ${TB_BUILD_ROOT}%{_bindir}/%{_target}-windres%{_exeext}; then
-    rm -f ${TB_BUILD_ROOT}%{_mandir}/man1/%{_target}-windres*
+  if test ! -f ${SB_BUILD_ROOT}%{_bindir}/%{_target}-windres%{_exeext}; then
+    rm -f ${SB_BUILD_ROOT}%{_mandir}/man1/%{_target}-windres*
   fi
-  if test ! -f ${TB_BUILD_ROOT}%{_bindir}/%{_target}-windmc%{_exeext}; then
-    rm -f ${TB_BUILD_ROOT}%{_mandir}/man1/%{_target}-windmc*
+  if test ! -f ${SB_BUILD_ROOT}%{_bindir}/%{_target}-windmc%{_exeext}; then
+    rm -f ${SB_BUILD_ROOT}%{_mandir}/man1/%{_target}-windmc*
   fi
 
   cd ..
diff --git a/config/expat-2-1.cfg b/config/expat-2-1.cfg
index c4a7365..b40229c 100644
--- a/config/expat-2-1.cfg
+++ b/config/expat-2-1.cfg
@@ -35,7 +35,7 @@ cd ..
 %if "%{_build}" != "%{_host}"
   CFLAGS_FOR_BUILD="-g -O2 -Wall" \
 %endif
-  CFLAGS="$TB_OPT_FLAGS" \
+  CFLAGS="$SB_OPT_FLAGS" \
   ./configure \
     --build=%{_build} --host=%{_host} \
     --verbose --disable-nls \
@@ -51,9 +51,9 @@ cd ..
 
 %install
   export PATH="%{_bindir}:${PATH}"
-  rm -rf $TB_BUILD_ROOT
+  rm -rf $SB_BUILD_ROOT
 
   cd expat-%{expat_version}
-  %{__make} DESTDIR=$TB_BUILD_ROOT install
+  %{__make} DESTDIR=$SB_BUILD_ROOT install
 
   cd ..
diff --git a/config/gcc-4.6-1.cfg b/config/gcc-4.6-1.cfg
index a25c0f9..4f4f96c 100644
--- a/config/gcc-4.6-1.cfg
+++ b/config/gcc-4.6-1.cfg
@@ -112,10 +112,10 @@ Source22: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
 %endif
 %if "%{_build}" != "%{_host}"
   CFLAGS_FOR_BUILD="-g -O2 -Wall" \
-  CC="%{_host}-gcc ${TB_OPT_FLAGS}" \
+  CC="%{_host}-gcc ${SB_OPT_FLAGS}" \
 %else
   # gcc is not ready to be compiled with -std=gnu99
-  CC=$(echo "%{__cc} ${TB_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
+  CC=$(echo "%{__cc} ${SB_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
 %endif
   ../gcc-%{gcc_version}/configure \
     --prefix=%{_prefix} \
@@ -155,21 +155,21 @@ Source22: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
 
 %install
   export PATH="%{_bindir}:${PATH}"
-  rm -rf $TB_BUILD_ROOT
+  rm -rf $SB_BUILD_ROOT
 
   cd build
-  %{__make} DESTDIR=$TB_BUILD_ROOT install
+  %{__make} DESTDIR=$SB_BUILD_ROOT install
   cd ..
 
   # libiberty doesn't honor --libdir, but always installs to a
   # magically guessed _libdir
-  rm -f ${TB_BUILD_ROOT}%{_libdir}/libiberty.a
+  rm -f ${SB_BUILD_ROOT}%{_libdir}/libiberty.a
 
   # We use the version from binutils
-  rm -f $TB_BUILD_ROOT%{_bindir}/%{_target}-c++filt%{_exeext}
+  rm -f $SB_BUILD_ROOT%{_bindir}/%{_target}-c++filt%{_exeext}
 
   # We don't ship info/dir
-  rm -f $TB_BUILD_ROOT%{_infodir}/dir
+  rm -f $SB_BUILD_ROOT%{_infodir}/dir
 
   # Don't want libffi's man-pages
-  rm -f $TB_BUILD_ROOT%{_mandir}/man3/*ffi*
+  rm -f $SB_BUILD_ROOT%{_mandir}/man3/*ffi*
diff --git a/config/gdb-7-1.cfg b/config/gdb-7-1.cfg
index a9b7061..49cffe7 100644
--- a/config/gdb-7-1.cfg
+++ b/config/gdb-7-1.cfg
@@ -33,7 +33,7 @@ cd ..
 %if "%{_build}" != "%{_host}"
   CFLAGS_FOR_BUILD="-g -O2 -Wall" \
 %endif
-  CFLAGS="$TB_OPT_FLAGS" \
+  CFLAGS="$SB_OPT_FLAGS" \
   ../gdb-%{gdb_version}/configure \
     --build=%{_build} --host=%{_host} \
     --target=%{_target} \
@@ -54,15 +54,15 @@ cd ..
 
 %install
   export PATH="%{_bindir}:${PATH}"
-  rm -rf $TB_BUILD_ROOT
+  rm -rf $SB_BUILD_ROOT
 
   cd build
-  %{__make} DESTDIR=$TB_BUILD_ROOT install
+  %{__make} DESTDIR=$SB_BUILD_ROOT install
 
   # Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
-  rm -rf $TB_BUILD_ROOT%{_infodir}/configure.info*
+  rm -rf $SB_BUILD_ROOT%{_infodir}/configure.info*
 
-  rm -f $TB_BUILD_ROOT%{_infodir}/dir
-  touch $TB_BUILD_ROOT%{_infodir}/dir
+  rm -f $SB_BUILD_ROOT%{_infodir}/dir
+  touch $SB_BUILD_ROOT%{_infodir}/dir
 
   cd ..
diff --git a/config/libusb-1-1.cfg b/config/libusb-1-1.cfg
index cf61b0c..da6dca6 100644
--- a/config/libusb-1-1.cfg
+++ b/config/libusb-1-1.cfg
@@ -36,7 +36,7 @@ cd ..
 %if "%{_build}" != "%{_host}"
   CFLAGS_FOR_BUILD="-g -O2 -Wall" \
 %endif
-  CFLAGS="$TB_OPT_FLAGS" \
+  CFLAGS="$SB_OPT_FLAGS" \
   ./configure \
     --build=%{_build} --host=%{_host} \
     --verbose --disable-nls \
@@ -52,9 +52,9 @@ cd ..
 
 %install
   export PATH="%{_bindir}:${PATH}"
-  rm -rf $TB_BUILD_ROOT
+  rm -rf $SB_BUILD_ROOT
 
   cd libusb-%{libusb_version}
-  %{__make} DESTDIR=$TB_BUILD_ROOT install
+  %{__make} DESTDIR=$SB_BUILD_ROOT install
 
   cd ..