[PATCH libX11] Don't rebuild ks_tables.h if nothing changed.

Matthieu Herrb matthieu at herrb.eu
Sat Oct 8 19:45:09 UTC 2016


On Sat, Oct 08, 2016 at 08:10:34PM +0200, Martin Natano wrote:
> This is my first patch to X.Org, so please tell me if there's something
> wrong with the submission or the patch itself.
> 
> natano
>

It looks good to me. 2 little things though:

- you should use 'git commit -s' to generate a Signed-off-by: field in
  the commit message

- the reason why this patch is needed is a limitation of BSD make
  GNU make doesn't trigger the extra rebuild during make install.

PS: I tend to consider the BSD make behaviour as a bug, but no one ever
cared to fix it :(

> 
> From e3601d791790ee0f1d0979e4d2a3852c390cd758 Mon Sep 17 00:00:00 2001
> From: Martin Natano <natano at natano.net>
> Date: Sat, 8 Oct 2016 19:57:50 +0200
> Subject: [PATCH] Don't rebuild ks_tables.h if nothing changed.
> 
> ks_tables.h is always considered out of date due to the forced rebuild
> of the makekeys util. This means the file is also rebuilt during 'make
> install', which is usually performed as root, which can to lead
> permission problems later on.
> ---
>  src/Makefile.am | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 15de59b..f8c476d 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -415,7 +415,5 @@ ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/src/util/makekeys$(EXEEXT)
>  	$(top_builddir)/src/util/makekeys $(KEYSYMDEFS) > ks_tables_h
>  	mv ks_tables_h $@
>  
> -$(top_builddir)/src/util/makekeys$(EXEEXT): force
> +$(top_builddir)/src/util/makekeys$(EXEEXT): $(top_builddir)/src/util/makekeys.c
>  	cd util && $(MAKE)
> -
> -force:
> -- 
> 2.9.3

-- 
Matthieu Herrb
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 793 bytes
Desc: not available
URL: <https://lists.x.org/archives/xorg-devel/attachments/20161008/68bb5407/attachment.sig>


More information about the xorg-devel mailing list