Fixes for CVS to work. Add RTEMS build for sparc/sis.

1 files changed, 22 insertions, 13 deletions

diff --git a/rtems/config/tools/rtems-kernel-4-1.cfg b/rtems/config/tools/rtems-kernel-4-1.cfg
index 3a31c06..4d4bd60 100644
--- a/rtems/config/tools/rtems-kernel-4-1.cfg
+++ b/rtems/config/tools/rtems-kernel-4-1.cfg
@@ -46,8 +46,9 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
 # Prepare the source code.
 #
 %prep
+  source_dir_0="rtems-%{rtems_kernel_version}"
   %setup -q -c -n %{name}-%{version}
-  cd rtems-%{rtems_kernel_version}
+  cd ${source_dir_0}
   %{?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}}
@@ -58,24 +59,31 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
   %{?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}}
+%if %{rtems_bootstrap}
+  ./bootstrap -c
+  ./bootstrap -p
+  ./bootstrap
+%endif
   cd ..
 
 %build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-  cd build
-  %{?host_force_32bit:HOST_FORCE_32BIT="-m32"}
-%if "%{_build}" != "%{_host}"
-  CFLAGS_FOR_BUILD="-g -O2 -Wall ${HOST_FORCE_32BIT}" \
-%endif
-  CFLAGS="$SB_OPT_FLAGS" \
-  ../rtems-%{rtems_kernel_version}/configure \
+  # Build directory support.
+  if test "%{_build}" != "%{_host}" ; then
+    build_dir="build-cxc"
+  else
+    build_dir="build"
+  fi
+  mkdir -p ${build_dir}
+  cd ${build_dir}
+
+  ../${source_dir_0}/configure \
     --build=%{_build} --host=%{_host} \
     --target=%{_target} \
     %{?rtems_posix:--enable-posix}%{!?rtems_posix:--disable-posix} \
     %{?rtems_networking:--enable-networking}%{!?rtems_networking:--disable-networking} \
     %{?rtems_cxx:--enable-cxx}%{!?rtems_cxx:--disable-cxx} \
     %{rtems_tests_opt} \
+    %{?rtems_bsps:--enable-rtemsbsp=%{rtems_bsps}} \
     --target=%{_target} \
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --exec-prefix=%{_exec_prefix} \
@@ -86,10 +94,11 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
   cd ..
 
 %install
-  export PATH="%{_bindir}:${PATH}"
-  rm -rf $SB_BUILD_ROOT
+  %{__rmdir} $SB_BUILD_ROOT
 
-  cd build
+  cd ${build_dir}
   %{__make} DESTDIR=$SB_BUILD_ROOT install
 
   cd ..
+
+%testing