forked from Imagelibrary/rtems
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)
79 lines
2.0 KiB
Plaintext
79 lines
2.0 KiB
Plaintext
dnl
|
|
dnl $Id$
|
|
dnl
|
|
dnl Check for target g++
|
|
dnl
|
|
dnl 98/05/20 Ralf Corsepius (corsepiu@faw.uni-ulm.de)
|
|
dnl Completely reworked
|
|
|
|
AC_DEFUN(RTEMS_PROG_CXX,
|
|
[
|
|
AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
|
|
AC_BEFORE([$0], [AC_PROG_CXX])dnl
|
|
AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
|
|
AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl
|
|
|
|
dnl Only accept g++ and c++
|
|
dnl NOTE: This might be too restrictive for native compilation
|
|
AC_PATH_PROGS(CXX_FOR_TARGET, "$program_prefix"g++ "$program_prefix"c++)
|
|
test -z "$CXX_FOR_TARGET" \
|
|
&& AC_MSG_ERROR([no acceptable c++ found in \$PATH])
|
|
|
|
dnl backup
|
|
rtems_save_CXX=$CXX
|
|
rtems_save_CXXFLAGS=$CXXFLAGS
|
|
|
|
dnl temporarily set CXX
|
|
CXX=$CXX_FOR_TARGET
|
|
|
|
AC_PROG_CXX_WORKS
|
|
AC_PROG_CXX_GNU
|
|
|
|
if test $ac_cv_prog_gxx = yes; then
|
|
GXX=yes
|
|
dnl Check whether -g works, even if CXXFLAGS is set, in case the package
|
|
dnl plays around with CXXFLAGS (such as to build both debugging and
|
|
dnl normal versions of a library), tasteless as that idea is.
|
|
ac_test_CXXFLAGS="${CXXFLAGS+set}"
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
CXXFLAGS=
|
|
AC_PROG_CXX_G
|
|
if test "$ac_test_CXXFLAGS" = set; then
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
elif test $ac_cv_prog_cxx_g = yes; then
|
|
CXXFLAGS="-g -O2"
|
|
else
|
|
CXXFLAGS="-O2"
|
|
fi
|
|
else
|
|
GXX=
|
|
test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
|
|
fi
|
|
|
|
rtems_cv_prog_gxx=$ac_cv_prog_gxx
|
|
rtems_cv_prog_cxx_g=$ac_cv_prog_cxx_g
|
|
rtems_cv_prog_cxx_works=$ac_cv_prog_cxx_works
|
|
rtems_cv_prog_cxx_cross=$ac_cv_prog_cxx_cross
|
|
|
|
CXX=$rtems_save_CXX
|
|
CXXFLAGS=$rtems_save_CXXFLAGS
|
|
|
|
dnl restore initial values
|
|
unset ac_cv_prog_gxx
|
|
unset ac_cv_prog_cc_g
|
|
unset ac_cv_prog_cxx_works
|
|
unset ac_cv_prog_cxx_cross
|
|
])
|
|
|
|
AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET,
|
|
[
|
|
RTEMS_PROG_CXX
|
|
if test "$rtems_cv_prog_cc_cross" != "$rtems_cv_prog_cxx_cross"; then
|
|
AC_MSG_ERROR([***]
|
|
[Inconsistency in compiler configuration:]
|
|
[Target C compiler and Target C++ compiler]
|
|
[must both either be cross compilers or native compilers]
|
|
[Hint: If building a posix bsp: LD_LIBRARY_PATH?] )
|
|
fi
|
|
])
|