2.5.70: scripts/Makefile.build fix

2.5.70: scripts/Makefile.build fix

[Stig Brautaset]

Hi, 

This patch seems to fix `make V=0' for me.


--- scripts/Makefile.build.orig	2003-06-01 19:35:38.000000000 +0100
+++ scripts/Makefile.build	2003-06-01 19:38:33.000000000 +0100
@@ -112,8 +112,7 @@
 		$(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) 		      \
 			-T $(@D)/.tmp_$(@F:.o=.ver);			      \
 		rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);	      \
-	fi;			
-					      \
+	fi;								      \
 	scripts/fixdep $(depfile) $@ '$(cmd_vcc_o_c)' > $(@D)/.$(@F).tmp;     \
 	rm -f $(depfile);						      \
 	mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd


Stig
-- 
brautaset.org

Re: 2.5.70: scripts/Makefile.build fix

[Sam Ravnborg]

On Sun, Jun 01, 2003 at 07:43:35PM +0100, Stig Brautaset wrote:
> Hi, 
> 
> This patch seems to fix `make V=0' for me.

Thanks for the patch.
I do not see the broken behaviour here. Can you provide me with information
about your system:
Make version, shell, architecture, distribution.

I got one report in private mail about make V=0 was broken, and would like
to find out what is causing the problem.

	Sam

Re: 2.5.70: scripts/Makefile.build fix

[Kenneth Johansson]

On Sun, 2003-06-01 at 22:44, Sam Ravnborg wrote:
> On Sun, Jun 01, 2003 at 07:43:35PM +0100, Stig Brautaset wrote:
> > Hi, 
> > 
> > This patch seems to fix `make V=0' for me.
> 
> Thanks for the patch.
> I do not see the broken behaviour here. Can you provide me with information
> about your system:
> Make version, shell, architecture, distribution.
> 
> I got one report in private mail about make V=0 was broken, and would like
> to find out what is causing the problem.

GNU Make 3.80
GNU bash, version 2.05b.0(1)-release (i386-pc-linux-gnu)
Debian unstable.

Re: 2.5.70: scripts/Makefile.build fix

[Stig Brautaset]

On Jun 01 2003, Sam wrote:
> On Sun, Jun 01, 2003 at 07:43:35PM +0100, Stig Brautaset wrote:
> > Hi, 
> > 
> > This patch seems to fix `make V=0' for me.
> 
> Thanks for the patch.
> I do not see the broken behaviour here. Can you provide me with information
> about your system:
> Make version, shell, architecture, distribution.


I'm on a debian testing/unstable hybrid, and `uname -a' says:
Linux arwen 2.4.20 #1 Sun Jan 26 13:54:18 GMT 2003 i686 GNU/Linux

zsh/testing uptodate 4.0.6-30		# interactive shell
dash/testing uptodate 0.4.17		# /bin/sh
make/testing uptodate 3.80-1

> I got one report in private mail about make V=0 was broken, and would
> like to find out what is causing the problem.

I believe the problem occurs because (without my patch) the last three
lines of the following define is invoked in its own subshell, and
echoing the commands for that second subshell is not omitted.

define rule_vcc_o_c
        $(if $($(quiet)cmd_checksrc),echo '  $($(quiet)cmd_checksrc)';)       \
        $(cmd_checksrc)                                                       \
        $(if $($(quiet)cmd_vcc_o_c),echo '  $($(quiet)cmd_vcc_o_c)';)         \
        $(cmd_vcc_o_c);                                                       \
                                                                              \
        if ! $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then         \
                mv $(@D)/.tmp_$(@F) $@;                                       \
        else                                                                  \
                $(CPP) -D__GENKSYMS__ $(c_flags) $<                           \
                | $(GENKSYMS)                                                 \
                > $(@D)/.tmp_$(@F:.o=.ver);                                   \
                                                                              \
                $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)                    \
                        -T $(@D)/.tmp_$(@F:.o=.ver);                          \
                rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);              \
        fi;                                                                   \
        scripts/fixdep $(depfile) $@ '$(cmd_vcc_o_c)' > $(@D)/.$(@F).tmp;     \
        rm -f $(depfile);                                                     \
        mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd
endef




Stig
-- 
brautaset.org

Re: 2.5.70: scripts/Makefile.build fix

[Sam Ravnborg]

On Sun, Jun 01, 2003 at 11:28:40PM +0100, Stig Brautaset wrote:
> On Jun 01 2003, Sam wrote:
> > On Sun, Jun 01, 2003 at 07:43:35PM +0100, Stig Brautaset wrote:
> > > Hi, 
> > > 
> > > This patch seems to fix `make V=0' for me.
I sent a slightly different patch to Linus yesterday that is now in
BK-latest.
Let me know if you still see the problem with fixdep.

	Sam