From 4b88b73b1bb039b3d088ea3dfe9ae19d511197b5 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Sun, 3 Sep 2006 10:50:36 +0000
Subject: Default to not building bsps. Too many problems.

---
 contrib/rtemsrpms/configure.ac  | 11 ++++++-----
 contrib/rtemsrpms/rtems.spec.in | 14 +++++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/contrib/rtemsrpms/configure.ac b/contrib/rtemsrpms/configure.ac
index 63f8e96904..d2a757ab7c 100644
--- a/contrib/rtemsrpms/configure.ac
+++ b/contrib/rtemsrpms/configure.ac
@@ -85,20 +85,21 @@ AC_MSG_RESULT([$targets])
 AC_MSG_CHECKING([for bsps])
 bsps="%{nil}"
 AC_ARG_ENABLE([bsps],
-[  --enable-bsps=<yes/bsps>      BSP list],[
+[  --enable-bsps=<yes/no/bsps>    BSP list],[
   case "$enable_bsps" in
   yes) # ignore, use default
+   bsps="all"
    ;;
-  no)
-   bsps="RTEMS_BSP=\"\""
+  no | none)
+   bsps="%{nil}"
    ;;
   *) # take a the list to build
-   bsps="RTEMS_BSP=\"$enable_bsps\""
+   bsps="$enable_bsps"
    ;;
   esac
 ])
 AS_IF([test x"$bsps" = x"%{nil}"],
-      [AC_MSG_RESULT([all])],
+      [AC_MSG_RESULT([none])],
       [AC_MSG_RESULT([$bsps])])
 
 AC_SUBST(RTEMS_API, [M4_RTEMS_API])
diff --git a/contrib/rtemsrpms/rtems.spec.in b/contrib/rtemsrpms/rtems.spec.in
index 19e13949e4..de8a9ab730 100644
--- a/contrib/rtemsrpms/rtems.spec.in
+++ b/contrib/rtemsrpms/rtems.spec.in
@@ -22,7 +22,7 @@
 %define rtems_version   %{expand:%(echo @RTEMS_VERSION@ | sed -e 's,-.*,,')}
 %define rtems_rpmvers   %{expand:%(echo @RTEMS_VERSION@ | tr - _ )}
 
-%define rtems_bsp       @RTEMS_BSP@
+%define rtems_bsps      @RTEMS_BSP@
 
 %define rtems_bootstrap @RTEMS_BOOTSTRAP@
 
@@ -57,13 +57,17 @@ RTEMS Libraries for %{rtems_target}.
 
 %build
   if [ "%{rtems_bootstrap}" = "yes" ]; then
-   cd rtems-%{rtems_api}
+   cd rtems-%{rtems_version}
    ./bootstrap
    cd ..
   fi
   mkdir -p build
+  if [ "x%{rtems_bsps}" = "x" ]; then
+   optargs="$optargs --disable-rtemsbsp"
+  else
+   optargs="$optargs --enable-rtemsbsp=\"%{rtems_bsps}\""
+  fi
   cd build
-  bps=""
   ../rtems-%{rtems_version}/configure \
     --prefix=%{_prefix} \
     --target=%rtems_target \
@@ -81,7 +85,7 @@ RTEMS Libraries for %{rtems_target}.
     --disable-expada \
     --enable-multilib \
     $optargs
-  make all %{rtems_bsp}
+  make all
   cd ..
 
 %install
@@ -103,7 +107,7 @@ RTEMS operating system for %{rtems_target}
 %defattr(-,root,root)
 
 # broken on the avr
-%config %{_prefix}/lib/pkgconfig
+#%config %{_prefix}/lib/pkgconfig
 %config %{_prefix}/make
 %doc    %{_prefix}/share/man
 
-- 
cgit v1.2.3