summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2014-04-23 14:31:55 +1000
committerChris Johns <chrisj@rtems.org>2014-04-23 14:32:34 +1000
commitb74c9cfb7687e7820c94469e23c94b0fb37d6928 (patch)
treef41d64a6c7b0797e96ded33d92b301ca82b04a8e
parentshsim: Correct linking for C++ (diff)
downloadrtems-b74c9cfb7687e7820c94469e23c94b0fb37d6928.tar.bz2
bootstrap: Sort the contents of the prinstall.am files.
Sorting removed the variations across different host operating systems and file systems.
-rwxr-xr-xbootstrap2
-rw-r--r--c/src/lib/libbsp/bfin/acinclude.m44
-rw-r--r--c/src/lib/libbsp/powerpc/acinclude.m44
3 files changed, 5 insertions, 5 deletions
diff --git a/bootstrap b/bootstrap
index 4226313460..e9cb851779 100755
--- a/bootstrap
+++ b/bootstrap
@@ -42,7 +42,7 @@ AC_DEFUN([RTEMS_CHECK_BSPDIR],
case "\$1" in
EOF
-for i in */bsp_specs; do
+for i in `LANG=C LC_COLLATE=C ls */bsp_specs | sort`; do
d=`dirname $i`
cat << EOF >> acinclude.m4~
$d )
diff --git a/c/src/lib/libbsp/bfin/acinclude.m4 b/c/src/lib/libbsp/bfin/acinclude.m4
index 828fd894dd..ab6082ef47 100644
--- a/c/src/lib/libbsp/bfin/acinclude.m4
+++ b/c/src/lib/libbsp/bfin/acinclude.m4
@@ -2,12 +2,12 @@
AC_DEFUN([RTEMS_CHECK_BSPDIR],
[
case "$1" in
+ TLL6527M )
+ AC_CONFIG_SUBDIRS([TLL6527M]);;
bf537Stamp )
AC_CONFIG_SUBDIRS([bf537Stamp]);;
eZKit533 )
AC_CONFIG_SUBDIRS([eZKit533]);;
- TLL6527M )
- AC_CONFIG_SUBDIRS([TLL6527M]);;
*)
AC_MSG_ERROR([Invalid BSP]);;
esac
diff --git a/c/src/lib/libbsp/powerpc/acinclude.m4 b/c/src/lib/libbsp/powerpc/acinclude.m4
index e46fa2bb86..644239947d 100644
--- a/c/src/lib/libbsp/powerpc/acinclude.m4
+++ b/c/src/lib/libbsp/powerpc/acinclude.m4
@@ -38,12 +38,12 @@ AC_DEFUN([RTEMS_CHECK_BSPDIR],
AC_CONFIG_SUBDIRS([t32mppc]);;
tqm8xx )
AC_CONFIG_SUBDIRS([tqm8xx]);;
+ virtex )
+ AC_CONFIG_SUBDIRS([virtex]);;
virtex4 )
AC_CONFIG_SUBDIRS([virtex4]);;
virtex5 )
AC_CONFIG_SUBDIRS([virtex5]);;
- virtex )
- AC_CONFIG_SUBDIRS([virtex]);;
*)
AC_MSG_ERROR([Invalid BSP]);;
esac