[oe-commits] Martin Jansa : Revert "dnsmasq: fix parallel make failure"

[git at git.openembedded.org]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Aug 10 11:25:35 2014 +0200

Revert "dnsmasq: fix parallel make failure"

This reverts commit 9550453f7d1c0773b0e5ba7af478222f55021240.

---

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

diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
index 1955d6f..e57ab72 100644
--- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
+++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc
@@ -11,7 +11,6 @@ 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
deleted file mode 100644
index 3d1040c..0000000
--- a/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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)/$@ .