[oe-commits] Shrikant Bobade : dnsmasq: fix parallel make failure

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 3740ef263860f6fc94305f32253b1a4e9338e3b9
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=3740ef263860f6fc94305f32253b1a4e9338e3b9

Author: Shrikant Bobade <Shrikant_Bobade at mentor.com>
Date:   Mon Aug  4 15:00:57 2014 +0530

dnsmasq: fix parallel make failure

The dnsmasq target depends on .configured and $(objs). .configured does an rm
-f *.o. Yet the only thing telling make to build the .configured target before
the $(objs) target was the order of the dependencies of the dnsmasq target. We
can't rely on that order when doing a paralllel make build, so add an explicit
rule to enforce that order.

Signed-off-by: Christopher Larson <kergoth at gmail.com>
Signed-off-by: Shrikant Bobade <Shrikant_Bobade at mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-networking/recipes-support/dnsmasq/dnsmasq.inc    |  1 +
 .../recipes-support/dnsmasq/files/parallel-make.patch  | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
index e57ab72..1955d6f 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
@@ -11,6 +11,7 @@ SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getV
            file://init \
            file://dnsmasq.conf \
            file://dnsmasq.service \
+           file://parallel-make.patch \
 "
 
 inherit update-rc.d systemd
diff --git a/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch b/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
new file mode 100644
index 0000000..3d1040c
--- /dev/null
+++ b/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
@@ -0,0 +1,18 @@
+The dnsmasq target depends on .configured and $(objs). .configured does an rm
+-f *.o. Yet the only thing telling make to build the .configured target before
+the $(objs) target was the order of the dependencies of the dnsmasq target. We
+can't rely on that order when doing a paralllel make build, so add an explicit
+rule to enforce that order.
+
+Signed-off-by: Christopher Larson <chris_larson at mentor.com>
+
+--- dnsmasq-2.68.orig/Makefile
++++ dnsmasq-2.68/Makefile
+@@ -139,6 +139,8 @@ bloatcheck : $(BUILDDIR)/dnsmasq_baselin
+	@rm -f *.o
+	@touch $@
+
++$(objs): .configured
++
+ $(objs:.o=.c) $(hdrs):
+	ln -s $(top)/$(SRC)/$@ .