[oe] [meta-oe][PATCH 3/5] dnsmasq: fix parallel make issue
Martin Jansa
martin.jansa at gmail.com
Sun Aug 10 09:24:31 UTC 2014
On Sat, Aug 09, 2014 at 06:01:13PM -0700, Christopher Larson wrote:
> From: Christopher Larson <chris_larson at mentor.com>
Is this v2 of this change which was sent earlier?
commit 9550453f7d1c0773b0e5ba7af478222f55021240
Author: Shrikant Bobade <Shrikant_Bobade at mentor.com>
Date: Mon Aug 4 14:42:57 2014 +0530
dnsmasq: fix parallel make failure
> Signed-off-by: Christopher Larson <chris_larson at mentor.com>
> ---
> .../recipes-support/dnsmasq/dnsmasq_2.68.bb | 2 ++
> .../recipes-support/dnsmasq/files/parallel-make.patch | 19 +++++++++++++++++++
> 2 files changed, 21 insertions(+)
> create mode 100644 meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
>
> diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
> index b1bef7a..6caa92a 100644
> --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
> +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.68.bb
> @@ -1,4 +1,6 @@
> require dnsmasq.inc
>
> +SRC_URI += "file://parallel-make.patch"
> +
> SRC_URI[dnsmasq-2.68.md5sum] = "6f8351ca0901f248efdb81532778d2ef"
> SRC_URI[dnsmasq-2.68.sha256sum] = "402019d61f53f1ccc04cc6218719fd3b158ea3fca9a83ab55471f981a2097c2f"
> 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..6d5b722
> --- /dev/null
> +++ b/meta-networking/recipes-support/dnsmasq/files/parallel-make.patch
> @@ -0,0 +1,19 @@
> +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>
> +Upstream-status: Pending
> +
> +--- 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)/$@ .
> --
> 1.8.3.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20140810/c456137a/attachment-0002.sig>
More information about the Openembedded-devel
mailing list