[rtems commit] bootstrap: Sort the contents of the prinstall.am files.
Chris Johns
chrisj at rtems.org
Wed Apr 23 04:24:48 UTC 2014
Module: rtems
Branch: master
Commit: b74c9cfb7687e7820c94469e23c94b0fb37d6928
Changeset: http://git.rtems.org/rtems/commit/?id=b74c9cfb7687e7820c94469e23c94b0fb37d6928
Author: Chris Johns <chrisj at rtems.org>
Date: Wed Apr 23 14:31:55 2014 +1000
bootstrap: Sort the contents of the prinstall.am files.
Sorting removed the variations across different host operating systems
and file systems.
---
bootstrap | 2 +-
c/src/lib/libbsp/bfin/acinclude.m4 | 4 ++--
c/src/lib/libbsp/powerpc/acinclude.m4 | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/bootstrap b/bootstrap
index 4226313..e9cb851 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 828fd89..ab6082e 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 e46fa2b..6442399 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
More information about the vc
mailing list