diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-07-30 17:52:50 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-07-30 17:52:50 +0000 |
| commit | 1896a650fc382d343844b56f4b79efe31562755e (patch) | |
| tree | 922de4dd1237cfcf6c7be0a8050e1e964fceadad /tools | |
| parent | Fixed typos. (diff) | |
| download | rtems-1896a650fc382d343844b56f4b79efe31562755e.tar.bz2 | |
Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
The main topic is replacing the hard-coded values for HAS_MP and
HAS_RDBG in custom/*.cfg with per-bsp configuration-time autoconf checks
(This is the patch I had mentioned before earlier this week).
CHANGES
* HAS_MP removed from custom/*.cfg, replaced with configuration time
autoconf check
* HAS_RDBG removed from custom/*.cfg, replaced with configuration-time
autoconf check
* NEW: c/src/make/bsp.cfg.in, takes configuration-time checked per-bsp
values (i.e. HAS_MP, HAS_RDBG), gets installed as
$(prefix)/<bsp>/make/bsp.cfg
* NEW: default.cfg includes bsp.cfg - this change is backward
compatible.
* IMPORT_SRC: apply VPATH instead for ts_386ex/i386ex subdirectory
Makefile.ins
* HACK: a bug in acpolish mis-handles addtions to makefile variables
which are enclosed in gmake conditionals:
c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in
* Apply inline_dir, HAS_MP and HAS_RDBG for avoiding configuration of
unneeded subdirectories in various configure.in files.
* Several minor changes in Makefile.ins and configure.ins, wrt. to the
order of including *.cfg and defining Makefile variables
APPLYING THE PATCH:
patch -p1 < rtems-rc-19990709-4.diff
./autogen
Diffstat (limited to '')
| -rw-r--r-- | tools/build/configure | 2 | ||||
| -rwxr-xr-x | tools/update/acpolish | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/tools/build/configure b/tools/build/configure index 6ebc34b503..4cbbc7b517 100644 --- a/tools/build/configure +++ b/tools/build/configure @@ -1378,7 +1378,6 @@ ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile install-if-change lock-directory -rcs-clean unlock-directory config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -1479,7 +1478,6 @@ cat >> $CONFIG_STATUS <<EOF CONFIG_FILES=\${CONFIG_FILES-"Makefile install-if-change lock-directory -rcs-clean unlock-directory "} EOF diff --git a/tools/update/acpolish b/tools/update/acpolish index 6cb14f3586..b86c225111 100755 --- a/tools/update/acpolish +++ b/tools/update/acpolish @@ -404,10 +404,17 @@ sub subst_line { # makefile variable addition # print STDERR "MACRO: <$1> += <$2>\n"; my $p = "$1" ; - ${"var_$p+"}="$2" ; - # place a marker - push @tbuf, "§5$p\n" ; - push @vars, "$p+" ; + if ( not defined ${"var_$p+"} ) + { + # place a marker + push @tbuf, "§5$p\n" ; + push @vars, "$p+" ; + } + else + { + print STDERR "WARNING += $_" ; + } + ${"var_$p+"} .=" $2" ; } elsif ( /^[\s]*(\@[^\s]+\@)$/o ) { # autoconf variable |