Changeset 37b5d78 in rtems

Timestamp:

09/14/01 17:30:22 (21 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

130291f

Parents:

0f466f7e

Message:

2001-09-14 Ralf Corsepius <corsepiu@…>

• aclocal/canonical-target-name.m4: Use AC_CANONICAL_TARGET instead of AC_CANONICAL_SYSTEM.
• aclocal/config-subdirs.m4: Use AS_MKDIR_P instead of mkinstalldirs and mkdir.
• aclocal/target.m4: Obsolete RTEMS_OUTPUT_BUILD_SUBDIRS, hack RTEMS_CONFIG_BUILD_SUBDIRS, introduce _RTEMS_OUTPUT_BUILD_SUBDIRS.

Files:

• ChangeLog (modified) (1 diff)
• aclocal/canonical-target-name.m4 (modified) (1 diff)
• aclocal/config-subdirs.m4 (modified) (3 diffs)
• aclocal/target.m4 (modified) (5 diffs)
• make/custom/mbx8xx.cfg (modified) (1 diff)

ChangeLog

@@ +1 @@
+2001-09-14      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        * aclocal/canonical-target-name.m4: Use AC_CANONICAL_TARGET instead
+        of AC_CANONICAL_SYSTEM.
+        * aclocal/config-subdirs.m4: Use AS_MKDIR_P instead of
+        mkinstalldirs and mkdir.
+        * aclocal/target.m4: Obsolete RTEMS_OUTPUT_BUILD_SUBDIRS,
+        hack RTEMS_CONFIG_BUILD_SUBDIRS, introduce
+        _RTEMS_OUTPUT_BUILD_SUBDIRS.
+        
 2001-09-13      Joel Sherrill <joel@OARcorp.com>
 

aclocal/canonical-target-name.m4

@@ -11 +11 @@
 AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU,
 [
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
 AC_MSG_CHECKING(rtems target cpu)
 case "${target}" in

aclocal/config-subdirs.m4

@@ -16 +16 @@
 # _RTEMS_PUSH_BUILDDIR
     echo configuring in $1
-## We use mkinstalldirs below as a workaround to mkdir -p not being
-## available everywhere, but us wanting to support deep directories.
     case "$srcdir" in
     .) ;;
-    *)
-      if ${ac_aux_dir}/mkinstalldirs $1; 
-      then :;
-      else
-        AC_MSG_ERROR([can not create `pwd`/$1])
-      fi
+    *) AS_MKDIR_P([$1])
       ;;
     esac
@@ -131 +124 @@
   done
 
-  test -n "$target_configdirs" && test -d $target_subdir || mkdir $target_subdir
+  if test -n "$target_configdirs" && test -d $target_subdir; 
+  then :;
+  else
+    AS_MKDIR_P(["$target_subdir"])
+  fi
 
   for ac_config_dir in $target_configdirs; do
@@ -208 +205 @@
   done
 
-  test -n "$host_configdirs" && test -d $host_subdir || mkdir $host_subdir
+  if test -n "$host_configdirs" && test -d $host_subdir;
+  then :;
+  else
+    AS_MKDIR_P(["$host_subdir"])
+  fi
 
   for ac_config_dir in $host_configdirs; do

aclocal/target.m4

@@ -4 +4 @@
 ## The macros below violate most autoconf and canonicalization standards
 AC_DEFUN(RTEMS_CONFIG_BUILD_SUBDIRS,
-[
-define([RTEMS_BUILD_SUBDIRS], 
-ifdef([RTEMS_BUILD_SUBDIRS], [RTEMS_BUILD_SUBDIRS ],)[$1])dnl
-build_subdirs="RTEMS_BUILD_SUBDIRS"
-AC_SUBST(build_subdirs)
+[AC_REQUIRE([_RTEMS_OUTPUT_BUILD_SUBDIRS])
+RTEMS_BUILD_SUBDIRS="$RTEMS_BUILD_SUBDIRS [$1]"
 ])
 
 dnl Derived from automake-1.4's AC_OUTPUT_SUBDIRS
-AC_DEFUN(RTEMS_OUTPUT_BUILD_SUBDIRS,
+AC_DEFUN([_RTEMS_OUTPUT_BUILD_SUBDIRS],
+[AC_CONFIG_COMMANDS([bsp-tools],
 [
+# HACK: This is a blantant hack and breaks Canadian crosses
+build_alias="$build_alias"
+host_alias="$build_alias"
 if test "$no_recursion" != yes; then
-  if test $build_alias != $host_alias; then 
+  if test x"$build_alias" != x"$host_alias"; then 
     target_subdir="$host_alias"
   else
@@ -22 +23 @@
   # Remove --cache-file and --srcdir arguments so they do not pile up.
   ac_sub_configure_args=
-  ac_prev=
-  for ac_arg in $ac_configure_args; do
-    if test -n "$ac_prev"; then
-      ac_prev=
+  rtems_prev=
+  for rtems_arg in $ac_configure_args; do
+    if test -n "$rtems_prev"; then
+      rtems_prev=
       continue
     fi
-    case "$ac_arg" in
+    case "$rtems_arg" in
     -cache-file | --cache-file | --cache-fil | --cache-fi \
     | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
+      rtems_prev=cache_file ;;
     -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
     | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
       ;;
     -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
+      rtems_prev=srcdir ;;
     -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
       ;;
@@ -42 +43 @@
     --build*) ;;
     --host*) ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
+    *_alias* ) ;; # HACK: Workaround to autoconf passing *_alias
+    *) ac_sub_configure_args="$ac_sub_configure_args $rtems_arg" ;;
     esac
   done
 
-  for ac_config_dir in $1; do
-
+  for rtems_config_dir in $RTEMS_BUILD_SUBDIRS; do
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.
-    if test ! -d $srcdir/$ac_config_dir; then
+    if test ! -d $srcdir/$rtems_config_dir; then
       continue
     fi
 
-    _RTEMS_PUSH_BUILDDIR([$ac_config_dir])
+    _RTEMS_PUSH_BUILDDIR([$rtems_config_dir])
 
-    _RTEMS_SUB_SRCDIR([$ac_config_dir])
+    _RTEMS_SUB_SRCDIR([$rtems_config_dir])
 
     # The recursion is here.
     if test -n "$ac_sub_configure"; then
-      ac_sub_cache_file=./config.cache
+#      ac_sub_cache_file=./config.cache
+      ac_sub_cache_file=/dev/null
       _RTEMS_GIVEN_INSTALL
 
@@ -72 +74 @@
       then :
       else
-        AC_MSG_ERROR([$ac_sub_configure failed for $ac_config_dir])
+        AC_MSG_ERROR([$ac_sub_configure failed for $rtems_config_dir])
       fi
     fi
@@ -78 +80 @@
     _RTEMS_POP_BUILDDIR
   done
-fi
+fi],
+[
+RTEMS_BUILD_SUBDIRS="$RTEMS_BUILD_SUBDIRS"
 ])
+])
+
+## FIXME: This is obsolete. Only kept for backward compatibility
+AU_DEFUN([RTEMS_OUTPUT_BUILD_SUBDIRS],[])

make/custom/mbx8xx.cfg

@@ -193 +193 @@
             $(START_FILE) $(LINK_OBJS) --start-group $(LINK_LIBS) --end-group
         $(NM) -g -n $(basename $@)_sym.exe> $(basename $@).nm
-        $(STRIP) -o $(basename $@).exe $(basename $@)_sym-exe
+        $(STRIP) -O $(basename $@).exe $(basename $@)_sym-exe
         $(SIZE) $(basename $@)_sym.exe
 endef