| Commit message (Collapse) | Author | Files | Lines |
|---|
|
Script does what is expected and tries to do it as
smartly as possible.
+ remove occurrences of two blank comment lines
next to each other after Id string line removed.
+ remove entire comment blocks which only exited to
contain CVS Ids
+ If the processing left a blank line at the top of
a file, it was removed.
|
|
See http://www.rtems.org/pipermail/rtems-devel/2012-May/001006.html
for details.
|
|
|
|
* acinclude.m4: Remove RTEMS_CHECK_CPU.
* configure.ac: Remove RTEMS_CHECK_CPU, RTEMS_ENABLE_BARE.
|
|
* acinclude.m4: Fix underquoting to silence automake-1.8.
|
|
* acinclude.m4: Merge-in former ../aclocal/config-subdirs.m4.
* configure.ac: remove RTEMS_CANONICAL_HOST.
|
|
* acinclude.m4: New.
Add RTEMS_CHECK_CPU.
|
|
* aclocal/bsp-alias.m4: New (Copied from ../../../aclocal).
* aclocal/canonical-host.m4: New (Copied from ../../../aclocal).
* aclocal/canonicalize-tools.m4: New (Copied from ../../../aclocal).
* aclocal/canonical-target-name.m4: New (Copied from ../../../aclocal).
* aclocal/check-cpu.m4: New (Copied from ../../../aclocal).
* aclocal/check-custom-bsp.m4: New (Copied from ../../../aclocal).
* aclocal/check-cxx.m4: New (Copied from ../../../aclocal).
* aclocal/check-itron.m4: New (Copied from ../../../aclocal).
* aclocal/check-multiprocessing.m4: New (Copied from ../../../aclocal).
* aclocal/check-networking.m4: New (Copied from ../../../aclocal).
* aclocal/check-posix.m4: New (Copied from ../../../aclocal).
* aclocal/check-tool.m4: New (Copied from ../../../aclocal).
* aclocal/config-subdirs.m4: New (Copied from ../../../aclocal).
* aclocal/enable-bare.m4: New (Copied from ../../../aclocal).
* aclocal/enable-cxx.m4: New (Copied from ../../../aclocal).
* aclocal/enable-itron.m4: New (Copied from ../../../aclocal).
* aclocal/enable-multiprocessing.m4: New (Copied from ../../../aclocal).
* aclocal/enable-networking.m4: New (Copied from ../../../aclocal).
* aclocal/enable-posix.m4: New (Copied from ../../../aclocal).
* aclocal/enable-rtemsbsp.m4: New (Copied from ../../../aclocal).
* aclocal/enable-tests.m4: New (Copied from ../../../aclocal).
* aclocal/env-rtemsbsp.m4: New (Copied from ../../../aclocal).
* aclocal/gcc-isystem.m4: New (Copied from ../../../aclocal).
* aclocal/gcc-pipe.m4: New (Copied from ../../../aclocal).
* aclocal/gcc-specs.m4: New (Copied from ../../../aclocal).
* aclocal/multilib.m4: New (Copied from ../../../aclocal).
* aclocal/path-ksh.m4: New (Copied from ../../../aclocal).
* aclocal/prog-cc.m4: New (Copied from ../../../aclocal).
* aclocal/prog-cxx.m4: New (Copied from ../../../aclocal).
* aclocal/project-root.m4: New (Copied from ../../../aclocal).
* aclocal/quoting.m4: New (Copied from ../../../aclocal).
* aclocal/rtems-cpu-subdirs.m4: New (Copied from ../../../aclocal).
* aclocal/rtems-flags.m4: New (Copied from ../../../aclocal).
* aclocal/rtems-test-no-pause.m4: New (Copied from ../../../aclocal).
* aclocal/rtems-top.m4: New (Copied from ../../../aclocal).
* aclocal/target.m4: New (Copied from ../../../aclocal).
* aclocal/tool-paths.m4: New (Copied from ../../../aclocal).
* aclocal/version.m4: New (Copied from ../../../aclocal).
|
|
* aclocal/check-cpu.m4: Peek into cpukit/score/cpu instead of
exec/score/cpu.
|
|
.. a major configuration cleanup
... major enhancement of automake support.
... and it contains a *major* breakthough:
Automake support for libchip and libmisc *LEAF* directories.
To implement this I have used several nasty tricks
* The basical trick is to wrap an old Makefile.in's contents into a
Makefile.am and still continue to use (i.e include) the old
*.cfg files.
* Replaced each INSTALL_IF_CHANGE and INSTALL_VARIANT with make
dependencies
* Add a gnu-make ifdef AUTOMAKE to main.cfg to avoid conflicts between
automake and RTEMS make rules
* Replaced each install:: and preinstall:: rule with make dependencies
* Replaced SUB_DIRS with SUBDIRS in all Makefile.ins (Automake
convention)
* Removed each manually added autoconf substitution which automake
performs automatically.
This is not yet full automake support, because using the temporary
installation directory, preinstallation in general and building variants
are in contradiction to automake's basic working principles ...
... the new Makefile.ams work still somewhat clumsy
... nevertheless they work (quite well).
WARNING:
At first glance this patch is small, but
* it affects the whole configuration system.
* it opens the road to introducing automake to all Makefile.ins
currently not being under automake control.
JOEL> Does this remove or add any files?
Both, all Makefile.ins below libchip and libmisc get replaced with
Makefile.ams.
|
|
The patch below actuallly consists of two patches:
1) moving librpc to c/src/librpc similar to what has been done to librtems++
2) reworked configure scripts, many safety and dependency checks added to
aclocal/*.m4 macros + configuration fixes.
To apply:
mkdir c/src/librpc
mkdir c/src/librpc/src
cp c/src/lib/librpc/*.c c/src/librpc/src
cp c/src/lib/librpc/Makefile.in c/src/librpc/src
mkdir c/src/librpc/include
mkdir c/src/librpc/include/rpc
cp c/src/lib/include/rpc/* c/src/librpc/include/rpc
patch -p1 < ../rtems-rc-19990820-7.diff
rm -rf c/src/lib/librpc
rm -rf c/src/lib/include/rpc
./autogen
The additional checks in aclocal/*m4 macros add rather restrictive, sometimes
unnecessarily restrictive constraints on the sequence of how macros can be
used in a configure.in script. Adding them has let my problems with some more
complicated configuration options vanish. Apparently some macros had not been
in the required order .
----
Now I still get some linking errors for some cpus and bsps, esp when linking
cdtest, but also at other locations:
e.g. this happens for mips64orion/p4600:
# make[5]: Entering directory
`/lfs/poseidon/users/rtems/src/multi/build/mips64orion-rtems/c/p4600/tests/samples/hello'
/opt/rtems/bin/mips64orion-rtems-gcc --pipe -B../../../../../../p4600/lib/
-specs bsp_specs -qrtems -DP4000 -DCPU_R4000 -DP3_DIAG -D_R4000 -D__mips=3
-mcpu=4600 -G0 -I../../../../../../p4600/lib/include/networking -g -Wall
-ansi -fasm -O4 -fomit-frame-pointer -o o-p4600/hello.exe
o-p4600/init.o ../../../../../../p4600/lib/no-dpmem.rel
../../../../../../p4600/lib/no-event.rel
../../../../../../p4600/lib/no-msg.rel ../../../../../../p4600/lib/no-mp.rel
../../../../../../p4600/lib/no-part.rel
../../../../../../p4600/lib/no-signal.rel
../../../../../../p4600/lib/no-timer.rel
../../../../../../p4600/lib/no-rtmon.rel
/opt/rtems/mips64orion-rtems/lib/libc.a(dtoa.o): In function `_dtoa_r':
/opt/hermes/embedded/build/build-mips64orion-tools/mips64orion-rtems/newlib/libc/stdlib/../../../../../src/newlib/libc/stdlib/dtoa.c:348: relocation truncated to fit: R_MIPS_LITERAL no symbol
/opt/hermes/embedded/build/build-mips64orion-tools/mips64orion-rtems/newlib/libc/stdlib/../../../../../src/newlib/libc/stdlib/dtoa.c:348: relocation truncated to fit: R_MIPS_LITERAL no symbol
/opt/hermes/embedded/build/build-mips64orion-tools/mips64orion-rtems/newlib/libc/stdlib/../../../../../src/newlib/libc/stdlib/dtoa.c:348: relocation truncated to fit: R_MIPS_LITERAL no symbol
collect2: ld returned 1 exit status
# mips64orion-rtems-gcc -v
Reading specs from /opt/rtems/lib/gcc-lib/mips64orion-rtems/2.95.1/specs
gcc version 2.95.1 19990816 (release)
# mips64orion-rtems-ld -v
GNU ld version 2.9.5 (with BFD 2.9.5)
|
|
This patch should fix the nastiest configuration bugs for no_cpu/no_bsp.
With this patch applied, configure --target=no_cpu-rtems now correctly
acknowledges its configuration, but later fails building when trying to
build libcsupport (I leave this problem for you :-).
Fixes/Changes:
* aclocal/canonicalize-target-name.m4: use RTEMS_CPU instead of
target_cpu, switch to a native compiler setup if target = no_cpu*rtems,
ie. implicitly use host=target (native) and RTEMS_CPU=no_cpu for
--target=no_cpu*rtems.
* add no_bsp/bsp_specs (Support -qrtems, -qrtems_debug; please check
before adding :-)
* Use RTEMS_CANONICALIZE_TARGET_CPU instead of AC_CANONICAL_SYSTEM in
toplevel/configure.in
* All references to $target_cpu in aclocal/*.m4, Makefile.ins and *.cfg
files changed to RTEMS_CPU
* bug fixes to exec/score/cpu/no_cpu/wrap (This part of the patch may
result into patch rejections, because your recently posted patch may
also have addressed this problem).
After applying this patch, please do:
cvs add c/src/lib/libbsp/no_cpu/no_bsp/bsp_specs
./autogen
|
|
OK, I 've made up my mind to cut a big chunk of my automake-patches (:-).
Below you can find a drop-in replacement of the aclocal directory. It
contains a lot of new macro files, most of them are directly cut from rtems
top-level configure script, some are new some are identical to former
versions. The motivation behind these files is to reuse parts from rtems
current top-level configure.in script in up-coming subdirectory configure.in
scripts.
I'd like to ask you to untar the archive ontop of the source tree and to
add/commit these files to CVS. Adding these files should not have any
influence on RTEMS momentary configuration (except of you are required to
run aclocal -I aclocal && autoconf afterwards), because most of them
currently are not used at all.
---------
BTW: Please upgrade to autoconf-2.13 and automake-2.4, if you havn't done
this already (egcs/CVS require them, too). My upcoming automake files
require automake-2.4 which requires autoconf-2.13 or later.
|
