[Dnsmasq-discuss] [PATCH] Fix race condition issue in makefile.

[Simon Kelley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Applied. Thanks.


Simon.


On 04/01/15 10:58, Yousong Zhou wrote:
> When doing rebuild with `make -j32' or the like, a race condition
> is likely to occur and the following error be emitted when doing
> parallel build.
> 
> make[1]: Entering directory `/home/yousong/git-repo/dnsmasq/src' cc
> -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o
> dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o
> tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o
> outpacket.o radv.o slaac.o auth.o ipset.o domain.o dnssec.o
> blockdata.o tables.o loop.o inotify.o cc: error: cache.o: No such
> file or directory cc: error: rfc1035.o: No such file or directory 
> cc: error: util.o: No such file or directory ...
> 
> Signed-off-by: Yousong Zhou <yszhou4tech at gmail.com> --- Makefile |
> 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile index 5675f60..bcbd557 100644 ---
> a/Makefile +++ b/Makefile @@ -148,10 +148,12 @@ $(copts_conf):
> $(hdrs) $(objs:.o=.c) $(hdrs): ln -s $(top)/$(SRC)/$@ .
> 
> +$(objs): $(copts_conf) $(hdrs) + .c.o: $(CC) $(CFLAGS) $(COPTS)
> $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $<
> 
> -dnsmasq : $(copts_conf) $(hdrs) $(objs) +dnsmasq : $(objs) $(CC)
> $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS)
> 
> dnsmasq.pot : $(objs:.o=.c) $(hdrs)
> 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJUqsQJAAoJEBXN2mrhkTWibFwQAIPR8naxwhklf1Of2kglpgl2
iH+fXFYECdP9LpBFH1UREaSWmM82cj8IVtOkGI1XkkdqFW6+ccSS4adAYbnSwEnt
M4ObNsJFMXyB19SpQepB8ByL0ZZqvX+X/DBjs8bL08Wh2DyZNX+h6qdKOIJLWNSP
eabhAmwAUs7NJpISigP4v52d5mVnl40v/nF0YVukfHePuVKAZD7d/j2wUSFbaUCR
Q750WZTfxZP7F6iquzae1uIOxsB3LndDD1HD8s3Y/jUF4kJBqarvmNDllWSLlhvj
iJjWvYD6CcM9DvhKTgaZJRn0lfCU80/1iuYw/FYFK3z7GkxnOTMOlTHxAAP+HqtY
UtNWAbbqFE5x7bu6e+D9rwL0iDzNfQw3oJ96Bs/Ohr/MILkEror4G0iQ4q4+VXcO
8DCzAhgdozT41ixj7MCxcPTXLiKc7cx8x1p5Nb0nUwfYLEfsQDmI8Q4XGAIoI9Iy
2Fwt9ziE4ir8HGODT6rFkmaipQ625SJPNqghGbp6HnCn7XySqgzK9qAN60IJPAPv
/3C8UgpZ9hxRe32hjxAT/84NAU6ENL09oS+cAn02edRNxXTtNuByc9DQekTxnL3c
xuxKpTMPe6qeW7x7D1Ab14n2sw6HMkHObcVW9pYz7JkbCcFXBk1kTR+cCgcuBMud
kYl4R14cDxMXFNVMGjhL
=zlBj
-----END PGP SIGNATURE-----