]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
[ipfire-2.x.git] / src / patches / dnsmasq / 0025-Fix-race-condition-issue-in-makefile.patch
1 From d8dbd903d024f84a149dac2f8a674a68dfed47a3 Mon Sep 17 00:00:00 2001
2 From: Yousong Zhou <yszhou4tech@gmail.com>
3 Date: Mon, 5 Jan 2015 17:03:35 +0000
4 Subject: [PATCH 25/98] Fix race condition issue in makefile.
5
6 ---
7 Makefile | 4 +++-
8 1 file changed, 3 insertions(+), 1 deletion(-)
9
10 diff --git a/Makefile b/Makefile
11 index 5675f60c2036..bcbd5571671d 100644
12 --- a/Makefile
13 +++ b/Makefile
14 @@ -148,10 +148,12 @@ $(copts_conf): $(hdrs)
15 $(objs:.o=.c) $(hdrs):
16 ln -s $(top)/$(SRC)/$@ .
17
18 +$(objs): $(copts_conf) $(hdrs)
19 +
20 .c.o:
21 $(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $<
22
23 -dnsmasq : $(copts_conf) $(hdrs) $(objs)
24 +dnsmasq : $(objs)
25 $(CC) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS)
26
27 dnsmasq.pot : $(objs:.o=.c) $(hdrs)
28 --
29 2.1.0
30