RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

Browse Source 
> When I run my script that just repeatedly builds different targets, some
    > of them die with an error like this:
    >
    > Making all RTEMS_BSP=gen68360 in cpugmake[5]: Entering directory
    > `/usr1/rtems/build/build-m68k-rtems/c/src/exec/score/cpu'
    > Making all RTEMS_BSP=gen68360 in @RTEMS_CPU@
    > /bin/sh: @RTEMS_CPU@: No such file or directory
    > gmake[5]: *** [all] Error 1
    > gmake[5]: Leaving directory
    > `/usr1/rtems/build/build-m68k-rtems/c/src/exec/score/cpu'
    >
    > It is not always the same variable substitution that fails.  Sometimes it
    > is @INSTALL@.  But reliably, it is a variable substitution that is
    > failing.
    >
    > Do you have any idea why this happens?

    Yep, I think I know what's going on.

    AC_SUBST(RTEMS_CPU) is missing in configure.ins, thus @RTEMS_CPU@ in
    target.cfg.in doesn't get substituted correctly, causing the bug above. Due
    to the redundancy of RTEMS_CPU, other most BSPs don't seem to be affected.

    Other similar problems probably exist for the unix/posix bsp and the hppa.1
    cpu, because their */tools/*Makefile.ams require RTEMS_CPU, too.
This commit is contained in:
Joel Sherrill
1999-06-15 22:46:44 +00:00
parent cf1806b4e8
commit d2d22780d5
47 changed files with 441 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
c/src/lib/libbsp/unix/posix/tools/Makefile.in
View File

@@ -71,6 +71,7 @@ MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
PERL = @PERL@
PROJECT_ROOT = @PROJECT_ROOT@
RTEMS_CPU = @RTEMS_CPU@
RTEMS_ROOT = @RTEMS_ROOT@
RTEMS_TOPdir = @RTEMS_TOPdir@
VERSION = @VERSION@

1
c/src/lib/libbsp/unix/posix/tools/aclocal.m4 vendored
View File

@@ -93,6 +93,7 @@ case "${rtems_target}" in
;;
esac
changequote([,])dnl
AC_SUBST(RTEMS_CPU)
AC_MSG_RESULT($RTEMS_CPU)
])

22
c/src/lib/libbsp/unix/posix/tools/configure vendored
View File

@@ -693,6 +693,7 @@ case "${rtems_target}" in
RTEMS_CPU=`echo $rtems_target | sed 's%^\([^-]*\)-\(.*\)$%\1%'`
;;
esac
echo "$ac_t""$RTEMS_CPU" 1>&6
@@ -708,7 +709,7 @@ echo "$ac_t""$RTEMS_CPU" 1>&6
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:712: checking for a BSD compatible install" >&5
echo "configure:713: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -761,7 +762,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
echo "configure:765: checking whether build environment is sane" >&5
echo "configure:766: checking whether build environment is sane" >&5
# Just in case
sleep 1
echo timestamp > conftestfile
@@ -818,7 +819,7 @@ test "$program_suffix" != NONE &&
test "$program_transform_name" = "" && program_transform_name="s,x,x,"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:822: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "configure:823: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -857,7 +858,7 @@ fi
missing_dir=`cd $ac_aux_dir && pwd`
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
echo "configure:861: checking for working aclocal" >&5
echo "configure:862: checking for working aclocal" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -870,7 +871,7 @@ else
fi
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
echo "configure:874: checking for working autoconf" >&5
echo "configure:875: checking for working autoconf" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -883,7 +884,7 @@ else
fi
echo $ac_n "checking for working automake""... $ac_c" 1>&6
echo "configure:887: checking for working automake" >&5
echo "configure:888: checking for working automake" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -896,7 +897,7 @@ else
fi
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
echo "configure:900: checking for working autoheader" >&5
echo "configure:901: checking for working autoheader" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -909,7 +910,7 @@ else
fi
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
echo "configure:913: checking for working makeinfo" >&5
echo "configure:914: checking for working makeinfo" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -929,7 +930,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:933: checking for $ac_word" >&5
echo "configure:934: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_KSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -974,7 +975,7 @@ fi
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:978: checking for $ac_word" >&5
echo "configure:979: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1190,6 +1191,7 @@ s%@build_alias@%$build_alias%g
s%@build_cpu@%$build_cpu%g
s%@build_vendor@%$build_vendor%g
s%@build_os@%$build_os%g
s%@RTEMS_CPU@%$RTEMS_CPU%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g