| Message ID | 1437085987-4512-1-git-send-email-yann.morin.1998@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
On 07/17/15 00:33, Yann E. MORIN wrote: > From: Guido Martínez <guido@vanguardiasur.com.ar> > > Commit bee5745c introduced an extra level of 'make' when the umask is > different from 0022. However, when several targets were specified on > the command line, a new make instance would be called for each target. > This introduces a huge performance overhead when many targets are > specified on the command line. > > To fix this, use the same approach as used in the mkmakefile script: > an addition target on which the MAKECMDGOALS depend, so that this > target is run only once. > > Note that the mkmakefile script contains a special exception for > Makefile, because the Makefile in the output directory is generated. > Since the top-level Makefile is not generated, this exception is not > needed here. > > While we're at it, also fix the whitespace in the UMASK assignment. > > Signed-off-by: Guido Martínez <guido@vanguardiasur.com.ar> > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > [yann.morin.1998@free.fr: aggregate patches from Arnout and Guido] > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Someone finally got it right :-) Sorry for all the spam... Regards, Arnout > > --- > Changes v0 -> v4: > - aggregate Arnout's and Guido's patches together, keepign the best of > both patches > - fix the spaces in UMASK assignment > --- > Makefile | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/Makefile b/Makefile > index 531ac5d..afdf554 100644 > --- a/Makefile > +++ b/Makefile > @@ -25,15 +25,15 @@ > #-------------------------------------------------------------- > > # Trick for always running with a fixed umask > -UMASK=0022 > +UMASK = 0022 > ifneq ($(shell umask),$(UMASK)) > -.PHONY: all $(MAKECMDGOALS) > +.PHONY: _all $(MAKECMDGOALS) > > -all: > - @umask $(UMASK) && $(MAKE) --no-print-directory > +$(MAKECMDGOALS): _all > + @: > > -$(MAKECMDGOALS): > - @umask $(UMASK) && $(MAKE) --no-print-directory $@ > +_all: > + @umask $(UMASK) && $(MAKE) --no-print-directory $(MAKECMDGOALS) > > else # umask > >
Arnout, Guido, All, On 2015-07-17 00:35 +0200, Arnout Vandecappelle spake thusly: > On 07/17/15 00:33, Yann E. MORIN wrote: > > From: Guido Martínez <guido@vanguardiasur.com.ar> > > > > Commit bee5745c introduced an extra level of 'make' when the umask is > > different from 0022. However, when several targets were specified on > > the command line, a new make instance would be called for each target. > > This introduces a huge performance overhead when many targets are > > specified on the command line. > > > > To fix this, use the same approach as used in the mkmakefile script: > > an addition target on which the MAKECMDGOALS depend, so that this > > target is run only once. > > > > Note that the mkmakefile script contains a special exception for > > Makefile, because the Makefile in the output directory is generated. > > Since the top-level Makefile is not generated, this exception is not > > needed here. > > > > While we're at it, also fix the whitespace in the UMASK assignment. > > > > Signed-off-by: Guido Martínez <guido@vanguardiasur.com.ar> > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > > [yann.morin.1998@free.fr: aggregate patches from Arnout and Guido] > > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> > > Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > > Someone finally got it right :-) Almost... I made a typo in the subject... ;-] Regards, Yann E. MORIN.
Dear Yann E. MORIN, On Fri, 17 Jul 2015 00:33:07 +0200, Yann E. MORIN wrote: > From: Guido Martínez <guido@vanguardiasur.com.ar> > > Commit bee5745c introduced an extra level of 'make' when the umask is > different from 0022. However, when several targets were specified on > the command line, a new make instance would be called for each target. > This introduces a huge performance overhead when many targets are > specified on the command line. > > To fix this, use the same approach as used in the mkmakefile script: > an addition target on which the MAKECMDGOALS depend, so that this > target is run only once. > > Note that the mkmakefile script contains a special exception for > Makefile, because the Makefile in the output directory is generated. > Since the top-level Makefile is not generated, this exception is not > needed here. > > While we're at it, also fix the whitespace in the UMASK assignment. > > Signed-off-by: Guido Martínez <guido@vanguardiasur.com.ar> > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > [yann.morin.1998@free.fr: aggregate patches from Arnout and Guido] > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> > > --- > Changes v0 -> v4: > - aggregate Arnout's and Guido's patches together, keepign the best of > both patches > - fix the spaces in UMASK assignment > --- > Makefile | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) Applied, thanks. Thomas
diff --git a/Makefile b/Makefile index 531ac5d..afdf554 100644 --- a/Makefile +++ b/Makefile @@ -25,15 +25,15 @@ #-------------------------------------------------------------- # Trick for always running with a fixed umask -UMASK=0022 +UMASK = 0022 ifneq ($(shell umask),$(UMASK)) -.PHONY: all $(MAKECMDGOALS) +.PHONY: _all $(MAKECMDGOALS) -all: - @umask $(UMASK) && $(MAKE) --no-print-directory +$(MAKECMDGOALS): _all + @: -$(MAKECMDGOALS): - @umask $(UMASK) && $(MAKE) --no-print-directory $@ +_all: + @umask $(UMASK) && $(MAKE) --no-print-directory $(MAKECMDGOALS) else # umask