egcs-19980628 libstdc++/Makefile.in problem

egcs-19980628 libstdc++/Makefile.in problem

[Joel Sherrill]

Are there any reported cases of this fragment from the
libstdc++/Makefile.in being incorrectly generated in the Makefile?

Around line 277 of libstdc++/Makefile:

       if [ x$(libsubdir) = x ] || [
x$(enable_version_specific_runtime_libs) != xyes ]; then \
          INSTALLDIR=$(libdir); \
        else \
          INSTALLDIR=$(libsubdir); \

the INSTALLDIR= lines are being put in the generated Makefile as:

    INSTALLDIR= XXX

with no trailing semi-colon or line continuation character.

I am targetting powerpc-rtems (based on powerpc-unknown-eabi) doing a one
tree style build with binutils 2.9.1 and newlib 1.8.0 on Redhat Linux 5.0.

Hints or patches appreciated. :)

--joel
Joel Sherrill                    Director of Research & Development
joel@OARcorp.com                 On-Line Applications Research
Ask me about RTEMS: a free RTOS  Huntsville AL 35805
   Support Available             (205) 722-9985

Re: egcs-19980628 libstdc++/Makefile.in problem

[Carlo Wood]

| Around line 277 of libstdc++/Makefile:
| 
|        if [ x$(libsubdir) = x ] || [
| x$(enable_version_specific_runtime_libs) != xyes ]; then \
|           INSTALLDIR=$(libdir); \
|         else \
|           INSTALLDIR=$(libsubdir); \

Hmm, on second thought - I am not sure if these
in-script INSTALLDIR = ..;\ don't need to be replaced
too.  In that case a different regular expression
would be needed of course.  I don't understand
why during cross compiling we install in $(tooldir)
and otherwise not - but this specific Makefile.in
part doesn't seem to take it into account.

If we need something like

|        if [ x$(libsubdir) = x ] || [
| x$(enable_version_specific_runtime_libs) != xyes ]; then \
|           INSTALLDIR=$(tooldir)/lib ; \
|         else \
|           INSTALLDIR=$(tooldir)/lib ; \

then the following would do the job:

sed -e 's|INSTALLDIR.*=[^;]*|INSTALLDIR = $(tooldir)/lib |'

-- 
 Carlo Wood  <carlo@runaway.xs4all.nl>

Re: egcs-19980628 libstdc++/Makefile.in problem

[Carlo Wood]

| Are there any reported cases of this fragment from the
| libstdc++/Makefile.in being incorrectly generated in the Makefile?
| 
| Around line 277 of libstdc++/Makefile:
| 
|        if [ x$(libsubdir) = x ] || [
| x$(enable_version_specific_runtime_libs) != xyes ]; then \
|           INSTALLDIR=$(libdir); \
|         else \
|           INSTALLDIR=$(libsubdir); \
| 
| the INSTALLDIR= lines are being put in the generated Makefile as:
| 
|     INSTALLDIR= XXX
| 
| with no trailing semi-colon or line continuation character.
| 
| I am targetting powerpc-rtems (based on powerpc-unknown-eabi) doing a one
| tree style build with binutils 2.9.1 and newlib 1.8.0 on Redhat Linux 5.0.
| 
| Hints or patches appreciated. :)

I found the bug in configure.in:

# If cross-compiling, we install in $(tooldir).
if [ -n "${with_cross_host}" ] ; then
    rm -f Makefile.tem
    sed \
        -e 's|INSTALLDIR.*=.*$|INSTALLDIR = $(tooldir)/lib|' \
        Makefile >Makefile.tem
    mv -f Makefile.tem Makefile
fi

This should be changed to:

    sed \
        -e 's|^INSTALLDIR.*=.*$|INSTALLDIR = $(tooldir)/lib|' \

Note the added '^'

-- 
 Carlo Wood  <carlo@runaway.xs4all.nl>