summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bind
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-28 02:00:57 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-15 21:58:26 +0000
commitb003df03358aea4e9e094ee339a9f6796866961e (patch)
treedbf306095bde45084417c483114ff288d6b77297 /meta/recipes-connectivity/bind
parent3dff11ca2c2af013b8033967b4a778390c784d42 (diff)
downloadpoky-b003df03358aea4e9e094ee339a9f6796866961e.tar.gz
bind: fix and enable parallel build
(From OE-Core rev: af851c7cdeab0ef53f00866da3da1a96b96bd63a) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bind')
-rw-r--r--meta/recipes-connectivity/bind/bind/bind-subdirs-run-serially.patch35
-rw-r--r--meta/recipes-connectivity/bind/bind_9.9.5.bb2
2 files changed, 36 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/bind/bind/bind-subdirs-run-serially.patch b/meta/recipes-connectivity/bind/bind/bind-subdirs-run-serially.patch
new file mode 100644
index 0000000000..9db7a1786f
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/bind-subdirs-run-serially.patch
@@ -0,0 +1,35 @@
1From b24468b6fe1f136bfd854773bc0e117aca0012d5 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Wed, 28 Jan 2015 01:23:09 -0800
4Subject: [PATCH] lib/export/isc/Makefile.in: let SUBDIRS run serially
5
6Fix parallel issue::
7make[2]: *** No rule to make target `nls/msgcat.o', needed by `libisc.a'. Stop.
8make[2]: *** Waiting for unfinished jobs....
9make[3]: Leaving directory `bind-9.9.5/lib/export/isc/unix'
10
11Upstream-Status: Pending
12
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14---
15 lib/export/isc/Makefile.in | 4 ++++
16 1 file changed, 4 insertions(+)
17
18diff --git a/lib/export/isc/Makefile.in b/lib/export/isc/Makefile.in
19index a92f66f..27dabcb 100644
20--- a/lib/export/isc/Makefile.in
21+++ b/lib/export/isc/Makefile.in
22@@ -103,6 +103,10 @@ SRCS = @ISC_EXTRA_SRCS@ \
23
24 LIBS = @LIBS@
25
26+# Note: the order of SUBDIRS is important.
27+# Attempt to disable parallel processing.
28+.NOTPARALLEL:
29+.NO_PARALLEL:
30 SUBDIRS = include unix nls @ISC_THREAD_DIR@
31 TARGETS = timestamp
32
33--
341.7.9.5
35
diff --git a/meta/recipes-connectivity/bind/bind_9.9.5.bb b/meta/recipes-connectivity/bind/bind_9.9.5.bb
index eacb23ffb8..8431eb940c 100644
--- a/meta/recipes-connectivity/bind/bind_9.9.5.bb
+++ b/meta/recipes-connectivity/bind/bind_9.9.5.bb
@@ -19,6 +19,7 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
19 file://init.d-add-support-for-read-only-rootfs.patch \ 19 file://init.d-add-support-for-read-only-rootfs.patch \
20 file://bind9_9_5-CVE-2014-8500.patch \ 20 file://bind9_9_5-CVE-2014-8500.patch \
21 file://bind-add-crosscripts-search-path-for-xml2-config.patch \ 21 file://bind-add-crosscripts-search-path-for-xml2-config.patch \
22 file://bind-subdirs-run-serially.patch \
22 " 23 "
23 24
24SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e" 25SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e"
@@ -48,7 +49,6 @@ INITSCRIPT_PARAMS = "defaults"
48 49
49SYSTEMD_SERVICE_${PN} = "named.service" 50SYSTEMD_SERVICE_${PN} = "named.service"
50 51
51PARALLEL_MAKE = ""
52 52
53RDEPENDS_${PN} = "python-core" 53RDEPENDS_${PN} = "python-core"
54 54