[PATCH] Don't hardcode the makefile name in config-ml.in

[PATCH] Don't hardcode the makefile name in config-ml.in

[Thiemo Seufer]

Hello All,

the appended patch un-hardcodes the makefile name in config-ml.in.
(Overriding the name on invocation is supposed to be possible,
currently this changes only some of the uses in config-ml.in.)


Thiemo


2007-11-19  Thiemo Seufer  <ths@mips.com>

	* config-ml.in: Don't hardcode the Makefile name.

Index: config-ml.in
===================================================================
--- config-ml.in.orig	2007-11-18 01:30:21.000000000 +0000
+++ config-ml.in	2007-11-18 01:31:57.000000000 +0000
@@ -586,8 +586,8 @@
 	  true; \
 	else \
 	  lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
-	  for dir in Makefile $(MULTIDIRS); do \
-	    if [ -f ../$${dir}/$${lib}/Makefile ]; then \
+	  for dir in ${Makefile} $(MULTIDIRS); do \
+	    if [ -f ../$${dir}/$${lib}/${Makefile} ]; then \
 	      if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
 	      then true; \
 	      else exit 1; \
@@ -605,7 +605,7 @@
 fi # ${ml_toplevel_p} = yes
 
 if [ "${ml_verbose}" = --verbose ]; then
-  echo "Adding multilib support to Makefile in ${ml_realsrcdir}"
+  echo "Adding multilib support to ${Makefile} in ${ml_realsrcdir}"
   if [ "${ml_toplevel_p}" = yes ]; then
     echo "multidirs=${multidirs}"
   fi
@@ -740,7 +740,7 @@
       fi
       (cd ${ml_dir}/${ml_libdir};
        ../${dotdot}${ml_unsubdir}symlink-tree ../${dotdot}${ml_unsubdir}${ml_libdir} "")
-      if [ -f ${ml_dir}/${ml_libdir}/Makefile ]; then
+      if [ -f ${ml_dir}/${ml_libdir}/${Makefile} ]; then
 	if [ x"${MAKE}" = x ]; then
 	  (cd ${ml_dir}/${ml_libdir}; make distclean)
 	else

Re: [PATCH] Don't hardcode the makefile name in config-ml.in

[Paolo Bonzini]

Thiemo Seufer wrote:
> Hello All,
> 
> the appended patch un-hardcodes the makefile name in config-ml.in.
> (Overriding the name on invocation is supposed to be possible,
> currently this changes only some of the uses in config-ml.in.)

Ok.

Paolo

Re: [PATCH] Don't hardcode the makefile name in config-ml.in

[Hans-Peter Nilsson]

On Mon, 19 Nov 2007, Thiemo Seufer wrote:
> 2007-11-19  Thiemo Seufer  <ths@mips.com>
> 
> 	* config-ml.in: Don't hardcode the Makefile name.

This match broke stuff like "make target-clean".  Just
the base libraries are cleaned, not the multlibs.  Apparently 
the Makefile=Makefile setting is lost somehow somewhere.
Happens to all libs, for example newlib, libstdc++-v3, libgcc.

brgds, H-P

Re: [PATCH] Don't hardcode the makefile name in config-ml.in

[Ralf Wildenhues]

Hello,

* Hans-Peter Nilsson wrote on Mon, Nov 26, 2007 at 01:47:36AM CET:
> On Mon, 19 Nov 2007, Thiemo Seufer wrote:
> > 2007-11-19  Thiemo Seufer  <ths@mips.com>
> > 
> > 	* config-ml.in: Don't hardcode the Makefile name.
> 
> This match broke stuff like "make target-clean".  Just
> the base libraries are cleaned, not the multlibs.  Apparently 
> the Makefile=Makefile setting is lost somehow somewhere.
> Happens to all libs, for example newlib, libstdc++-v3, libgcc.

Please try the first patch in
<http://gcc.gnu.org/ml/gcc-patches/2007-11/msg01183.html>.

Cheers,
Ralf

Re: [PATCH] Don't hardcode the makefile name in config-ml.in

[Paolo Bonzini]

> Please try the first patch in
> <http://gcc.gnu.org/ml/gcc-patches/2007-11/msg01183.html>.

The third patch there is okay.

Now on to the first.  First of all, my apologies for approving the wrong 
patch.  I hadn't realized that the modified code was inside a "cat << \EOF".

If I understand correctly, the ${Makefile} in

	  for dir in ${Makefile} $(MULTIDIRS); do \

is just a way to avoid an error if MULTIDIRS is empty but [ -z 
"$(MULTIDIRS)" ] does not get it?  If this is the case, I would prefer 
to have something like

         set fnord $(MULTIDIRS); shift; \
         lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
         for dir; do \
EOF
cat >>Multi.tem <<EOF
           if [ -f ../$${dir}/$${lib}/${Makefile} ]; then \
EOF
cat >>Multi.tem <<\EOF
             if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
             then true; \
             else exit 1; \
             fi; \
           else true; \
           fi; \
         done; \

Ralf, portability-wise, what do you think?

Paolo

Re: [PATCH] Don't hardcode the makefile name in config-ml.in

[Andreas Schwab]

Paolo Bonzini <bonzini@gnu.org> writes:

> If I understand correctly, the ${Makefile} in
>
> 	  for dir in ${Makefile} $(MULTIDIRS); do \
>
> is just a way to avoid an error if MULTIDIRS is empty but [ -z 
> "$(MULTIDIRS)" ] does not get it?

It would be a syntax error in some shells, and the test is part of the
same command, so the loop command would be parsed nevertheless.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [PATCH] Don't hardcode the makefile name in config-ml.in

[Ralf Wildenhues]

* Paolo Bonzini wrote on Mon, Nov 26, 2007 at 11:48:22AM CET:
>
>> Please try the first patch in
>> <http://gcc.gnu.org/ml/gcc-patches/2007-11/msg01183.html>.
>
> The third patch there is okay.

Thanks.  I need someone to apply it for me (to GCC and src).

> Now on to the first.  First of all, my apologies for approving the wrong 
> patch.  I hadn't realized that the modified code was inside a "cat << 
> \EOF".
>
> If I understand correctly, the ${Makefile} in
>
> 	  for dir in ${Makefile} $(MULTIDIRS); do \
>
> is just a way to avoid an error if MULTIDIRS is empty but [ -z 
> "$(MULTIDIRS)" ] does not get it?

OK, but then I would do this:
  for dir in : $(MULTIDIRS); do \
    test $$dir != : || continue; \

If you like, I can submit a patch for this tonight.

> If this is the case, I would prefer to 
> have something like
>
>         set fnord $(MULTIDIRS); shift; \
>         lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
>         for dir; do \
[...]
>
> Ralf, portability-wise, what do you think?

Some ancient shell out there does not grok `for dir; do'
but only `for dir
          do'

(i.e., a newline works, but semi-colon doesn't).

Cheers,
Ralf

Re: [PATCH] Don't hardcode the makefile name in config-ml.in

[Paolo Bonzini]

> OK, but then I would do this:
>   for dir in : $(MULTIDIRS); do \
>     test $$dir != : || continue; \
> 
> If you like, I can submit a patch for this tonight.

That's ok.  Please submit a single patch, I can mentally separate them 
and it will be easier to apply.

Paolo