Permalink
Browse files

Merger from rtems-4-6-branch.

  • Loading branch information...
1 parent 0b22af6 commit 55837f7e4d99fa6c988edb6278f287789f490273 Ralf Corsepius committed Mar 25, 2003
Showing with 133 additions and 112 deletions.
  1. +55 −0 ChangeLog
  2. +3 −15 README.cdn-X
  3. +75 −97 acinclude.m4
View
@@ -1,3 +1,58 @@
+2003-03-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * acinclude.m4: Reformat build_* handling.
+ Preset *_alias if empty.
+ * configure.ac: Change tools/build to build-config dirs.
+ Conditionally build tools/build as host-config dirs.
+
+2003-03-13 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * acinclude.m4: Fix broken comments.
+ Add hidden option --enable-experimental.
+ * README.cdn-X: Update.
+ * configure.ac: Build tools/build as host and build-host tools to
+ accomodate those BSPs applying packhex in <BSP>.cfg.
+ Build tools/cpu as build-host tools.
+
+2003-03-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * tools/Makefile.am: Remove.
+ * configure.ac: Remove tools.
+ * acinclude.m4: Fix build_subdir handling.
+ * Makefile.am: Remove tools from SUBDIRS.
+ Rename HOST|BUILD|TARGET_SUBDIRS into host|build|target_SUBDIRS.
+
+2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Remove AC_CONFIG_AUX_DIR.
+ * alocal/rtems-top.a4: Add AC_CONFIG_AUX_DIR.
+
+2003-02-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * bootstrap: Add ACLOCAL, AUTOHEADER.
+ Don't check for auto*tool-versions.
+
+2003-02-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * config-ml.in: Don't build sh-rtems ml and ml/m2 multilib variants.
+
+2003-02-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * automake/compile.am: Introduce depend-gcc.
+ * automake/lib.am: Remove stray comment.
+ * automake/local.am: Introduce depend-gcc.
+
+2003-02-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * config-ml.in: Don't build arm-rtems/*fpu* multilib variants.
+
+2003-02-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/rtems-top.m4: Set PROJECT_ROOT unconditionally.
+ * automake/local.am: Remove $(ARCH), clean-local.
+ * automake/compile.am: Add $(ARCH), clean-local.
+ Set CXXFLAGS = @RTEMS_CFLAGS@ $(XCXXFLAGS).
+
2003-02-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove references to obsoleted files
View
@@ -38,7 +38,7 @@ mkdir build
cd build
<path>/rtems/configure [options] \
--target=sparc-rtems \
---prefix=/opt/cygwin/rtems/sparc-rtems
+--prefix=/opt/cygwin
make
make install
@@ -56,11 +56,11 @@ cd host
--target=sparc-rtems \
--build=`<path>/rtems/config.guess` \
--host=i386-cygwin \
---prefix=/opt/cygwin/rtems
+--prefix=/opt/cygwin
make
make install
-This will build RTEMS host-tools for i386-cygwin and install it to the given
+This will build RTEMS host-tools for i386-cygwin and install them to the given
PREFIX.
@@ -70,16 +70,4 @@ PREFIX.
* At present time, building RTEMS Canadian Cross is known to be immature, and
to require additional work. Do not expect this to work.
-* The configure scripts expect to find a native c-compiler called "cc". If
-your host doesn't have such a "cc" (e.g. Cygwin) or has a non-functional
-"cc" (eg. Solaris) try introducing a symlink <functional-cc> -> cc
-(E.g.: ln -s <path-to>/gcc /opt/rtems/bin/cc) and make sure this cc can be
-found on $PATH.
-
-* It will *not* work for all BSPs requiring BSP-specific host-tools
-(Unfortunately, this comprizes i386-rtems/pcx86 and all powerpc BSPs).
-
-* Incomplete support for *_FOR_TARGET, *_FOR_HOST, *_FOR_BUILD environment
-variables.
-
* The <toplevel>/make/ directory hierarchy is not treated correctly.
View
@@ -23,68 +23,88 @@ AC_DEFUN([_RTEMS_SUBST_IFNOT],
[AC_SUBST([$1],["[$]$1 $2"])])
])
+AC_DEFUN([_RTEMS_TOOLS],
+[
+m4_ifdef([_RTEMS_$2_CONFIGDIRS_LIST],
+[
+_RTEMS_ARG_VAR([CC_FOR_$2],
+ [c-compiler to be used for $1 subdirs (default: auto-detected)])
+_RTEMS_ARG_VAR([CFLAGS_FOR_$2],
+ [c-flags to be used for $1 subdirs (default: provided by autoconf)])
+_RTEMS_ARG_VAR([CXX_FOR_$2],
+ [c++-compiler to be used for $1 subdirs (default: auto-detected)])
+_RTEMS_ARG_VAR([CXXFLAGS_FOR_$2],
+ [c++-flags to be used for $1 subdirs (default: provided by autoconf)])
+])
+])
+
AC_DEFUN([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS],
[
AC_CONFIG_COMMANDS_PRE([
+
+test -z "$host_alias" && host_alias="$host"
+test -z "$build_alias" && build_alias="$build"
+test -z "$target_alias" && target_alias="$target"
+
_RTEMS_BUILD_CONFIG_PREPARE
_RTEMS_HOST_CONFIG_PREPARE
_RTEMS_TARGET_CONFIG_PREPARE
+build_SUBDIRS="${build_configdirs}"
+build_configdirs="${build_configdirs}"
+
AS_IF([test $build = $host],
-[
+[dnl
AS_IF([test $host = $target],
[dnl b=h, h=t, t=b
- BUILD_SUBDIRS="${build_configdirs}"
- build_configdirs="${build_configdirs}"
- HOST_SUBDIRS=""
- host_configdirs=""
- TARGET_SUBDIRS=""
- target_configdirs=""],
+ host_SUBDIRS="${host_configdirs}"
+ host_configdirs="${host_configdirs}"
+ target_SUBDIRS="${target_configdirs}"
+ target_configdirs="${target_configdirs}"],
[dnl b=h, h!=t, t!=b
- BUILD_SUBDIRS="${build_configdirs}"
- build_configdirs="${build_configdirs}"
- HOST_SUBDIRS=""
- host_configdirs=""
- TARGET_SUBDIRS=`echo "${target_configdirs}" | \
+ host_SUBDIRS="${host_configdirs}"
+ host_configdirs="${host_configdirs}"
+ target_SUBDIRS=`echo "${target_configdirs}" | \
sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
target_configdirs="${target_configdirs}"
])
-],[
+],[dnl
AS_IF([test $host = $target],
[ dnl b!=h, h=t, b!=t
- BUILD_SUBDIRS="${build_configdirs}"
- build_configdirs="${build_configdirs}"
- HOST_SUBDIRS=`echo "${host_configdirs}" | \
+ host_SUBDIRS=`echo "${host_configdirs}" | \
sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"`
host_configdirs="${host_configdirs}"
- TARGET_SUBDIRS=""
- target_configdirs=""],
- [
+ AS_IF([test x"$enable_experimental" = x"yes" ],[
+ target_SUBDIRS=`echo "${target_configdirs}" | \
+ sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
+ target_configdirs="${target_configdirs}"
+ ])
+ ],[dnl
AS_IF([test $build = $target],
[dnl b!=h, h!=t, b=t
- BUILD_SUBDIRS="${build_configdirs}"
- build_configdirs="${build_configdirs}"
- HOST_SUBDIRS=`echo "${host_configdirs}" | \
+ host_SUBDIRS=`echo "${host_configdirs}" | \
sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"`
host_configdirs="${host_configdirs}"
- TARGET_SUBDIRS=""
- target_configdirs=""],
- [dnl b!=h, h!=t, b!=t
- BUILD_SUBDIRS="${build_configdirs}"
- build_configdirs="${build_configdirs}"
- HOST_SUBDIRS=`echo "${host_configdirs}" | \
+ AS_IF([test x"$enable_experimental" = x"yes" ],[
+ target_SUBDIRS="${target_configdirs}"
+ target_configdirs="${target_configdirs}"
+ ])
+ ],[dnl b!=h, h!=t, b!=t
+ host_SUBDIRS=`echo "${host_configdirs}" | \
sed -e "s%\([[^ ]][[^ ]]*\)%$host_alias/\1%g"`
host_configdirs="${host_configdirs}"
- TARGET_SUBDIRS=`echo "${target_configdirs}" | \
- sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
- target_configdirs="${target_configdirs}"
+ AS_IF([test x"$enable_experimental" = x"yes" ],[
+ target_SUBDIRS=`echo "${target_configdirs}" | \
+ sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"`
+ target_configdirs="${target_configdirs}"
+ ])
])
])
])
-AC_SUBST(HOST_SUBDIRS)
-AC_SUBST(TARGET_SUBDIRS)
-AC_SUBST(BUILD_SUBDIRS)
+AC_SUBST(host_SUBDIRS)
+AC_SUBST(target_SUBDIRS)
+AC_SUBST(build_SUBDIRS)
])
AC_CONFIG_COMMANDS_POST([
@@ -160,33 +180,25 @@ dnl _RTEMS_OUTPUT_SUBDIRS([host|target|build],[HOST|TARGET|BUILD])
AC_DEFUN([_RTEMS_OUTPUT_SUBDIRS],[
m4_ifdef([_RTEMS_$2_CONFIGDIRS_LIST],
[
-_RTEMS_ARG_VAR([CC_FOR_$2],
- [c-compiler to be used for $1 subdirs (default: auto-detected)])
-_RTEMS_ARG_VAR([CFLAGS_FOR_$2],
- [c-flags to be used for $1 subdirs (default: provided by autoconf)])
-_RTEMS_ARG_VAR([CXX_FOR_$2],
- [c++-compiler to be used for $1 subdirs (default: auto-detected)])
-_RTEMS_ARG_VAR([CXXFLAGS_FOR_$2],
- [c++-flags to be used for $1 subdirs (default: provided by autoconf)])
if test "$no_recursion" != yes; then
- if test -n "${$2_SUBDIRS}"; then
+ if test -n "${$1_SUBDIRS}"; then
ac_sub_configure_args="[$]$1args"
# Always prepend --prefix to ensure using the same prefix
# in subdir configurations.
ac_sub_configure_args="'--prefix=$prefix' $ac_sub_configure_args"
+ # make sure that $1_subdir is not empty
+ test -n "$$1_subdir" || $1_subdir="."
+
case "$$1_subdir" in
"." ) ;;
* )
ac_sub_configure_args="$ac_sub_configure_args '--with-target-subdir=$$1_subdir' '--exec-prefix=${prefix}/$$1_subdir'"
;;
esac
- # make sure that $1_subdir is not empty
- test -n "$$1_subdir" || $1_subdir="."
-
ac_popdir=`pwd`
for ac_dir in $$1_configdirs; do
@@ -247,18 +259,6 @@ fi
])
])
-## PUBLIC: RTEMS_BUILD_CONFIG_SUBDIRS(build_subdir)
-# subdirs to be built for the build environment
-AC_DEFUN([RTEMS_BUILD_CONFIG_SUBDIRS],[
-m4_append([_RTEMS_BUILD_CONFIGDIRS_LIST],[ $1])
-dnl Always append to build_configdirs
-AC_SUBST(build_configdirs,"$build_configdirs $1")
-
-m4_divert_text([DEFAULTS],
- [ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
-m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
-])
-
AC_DEFUN([_RTEMS_CONFIGURE_ARGS_PRUNE],
[
$1_prune()
@@ -311,18 +311,28 @@ $1_prune()
}
])
+## PUBLIC: RTEMS_BUILD_CONFIG_SUBDIRS(build_subdir)
+# subdirs to be built for the build environment
+AC_DEFUN([RTEMS_BUILD_CONFIG_SUBDIRS],[
+m4_append([_RTEMS_BUILD_CONFIGDIRS_LIST],[ $1])
+dnl Always append to build_configdirs
+AC_SUBST(build_configdirs,"$build_configdirs $1")
+
+m4_divert_text([DEFAULTS],
+ [ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
+m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
+])
+
AC_DEFUN(_RTEMS_BUILD_CONFIG_PREPARE,[
## # Record the configure arguments in Makefile.
m4_ifdef([_RTEMS_BUILD_CONFIGDIRS_LIST],
[
+m4_expand_once([_RTEMS_TOOLS([build],[BUILD])])
m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([buildargs])])
eval buildargs_prune $ac_configure_args
buildargs="'--host=${build}' '--build=${build}' ${buildargs}"
test -n "${target_alias}" && \
buildargs="${buildargs} --target='${target_alias}'"
-
-## AC_SUBST(buildargs)
-
build_subdir="."
],[])
])
@@ -332,21 +342,7 @@ build_subdir="."
AC_DEFUN([RTEMS_HOST_CONFIG_SUBDIRS],[
m4_append([_RTEMS_HOST_CONFIGDIRS_LIST],[ $1])dnl
-if test $build = $host;
-then
- AS_IF([test $host = $target],
- [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])],
- [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])]
- )
-else
- AS_IF([test $host = $target],
- [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])],
- [AS_IF([test $build = $target],
- [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])],
- [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])]
- )]
- )
-fi
+_RTEMS_SUBST_IFNOT([host_configdirs],[$1])
m4_divert_text([DEFAULTS],
[ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
@@ -356,12 +352,10 @@ m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
AC_DEFUN(_RTEMS_HOST_CONFIG_PREPARE,[
m4_ifdef([_RTEMS_HOST_CONFIGDIRS_LIST],
[
-## Record configure arguments in Makefile.
+m4_expand_once([_RTEMS_TOOLS([host],[HOST])])
m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([hostargs])])
eval hostargs_prune $ac_configure_args
hostargs="'--host=${host_alias}' '--build=${build}' '--target=${target_alias}' ${hostargs}"
-## AC_SUBST(hostargs)
-
host_subdir="${host_alias}"
],[])
])
@@ -371,21 +365,7 @@ host_subdir="${host_alias}"
AC_DEFUN([RTEMS_TARGET_CONFIG_SUBDIRS],[
m4_append([_RTEMS_TARGET_CONFIGDIRS_LIST],[ $1])
-if test $build = $host;
-then
- AS_IF([test $host = $target],
- [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])],
- [_RTEMS_SUBST_IFNOT([target_configdirs],[$1])]
- )
-else
- AS_IF([test $host = $target],
- [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])],
- [AS_IF([test $build = $target],
- [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])],
- [_RTEMS_SUBST_IFNOT([target_configdirs],[$1])]
- )]
- )
-fi
+_RTEMS_SUBST_IFNOT([target_configdirs],[$1])
m4_divert_text([DEFAULTS],
[ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"])
@@ -395,12 +375,10 @@ m4_expand_once([_RTEMS_COMMANDS_POST_CONFIG_SUBDIRS])
AC_DEFUN(_RTEMS_TARGET_CONFIG_PREPARE,[
m4_ifdef([_RTEMS_TARGET_CONFIGDIRS_LIST],
[
-## Record the configure arguments in Makefile.
+m4_expand_once([_RTEMS_TOOLS([target],[TARGET])])
m4_expand_once([_RTEMS_CONFIGURE_ARGS_PRUNE([targetargs])])
eval targetargs_prune $ac_configure_args
targetargs="'--host=${target_alias}' '--build=${build}' '--target=${target_alias}' ${targetargs}"
-## AC_SUBST(targetargs)
-
target_subdir="${target_alias}"
],[])
])

0 comments on commit 55837f7

Please sign in to comment.