diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-01-28 02:00:57 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-14 22:26:09 +0000 |
| commit | af851c7cdeab0ef53f00866da3da1a96b96bd63a (patch) | |
| tree | 2c41a71dabb76b7b87f206ad63aeb602eeed3d08 | |
| parent | 7ea1979f687777bcafec393b6ab126ec11017074 (diff) | |
| download | openembedded-core-contrib-af851c7cdeab0ef53f00866da3da1a96b96bd63a.tar.gz | |
bind: fix and enable parallel build
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -rw-r--r-- | meta/recipes-connectivity/bind/bind/bind-subdirs-run-serially.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bind/bind_9.9.5.bb | 2 |
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 @@ +From b24468b6fe1f136bfd854773bc0e117aca0012d5 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Wed, 28 Jan 2015 01:23:09 -0800 +Subject: [PATCH] lib/export/isc/Makefile.in: let SUBDIRS run serially + +Fix parallel issue:: +make[2]: *** No rule to make target `nls/msgcat.o', needed by `libisc.a'. Stop. +make[2]: *** Waiting for unfinished jobs.... +make[3]: Leaving directory `bind-9.9.5/lib/export/isc/unix' + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + lib/export/isc/Makefile.in | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/lib/export/isc/Makefile.in b/lib/export/isc/Makefile.in +index a92f66f..27dabcb 100644 +--- a/lib/export/isc/Makefile.in ++++ b/lib/export/isc/Makefile.in +@@ -103,6 +103,10 @@ SRCS = @ISC_EXTRA_SRCS@ \ + + LIBS = @LIBS@ + ++# Note: the order of SUBDIRS is important. ++# Attempt to disable parallel processing. ++.NOTPARALLEL: ++.NO_PARALLEL: + SUBDIRS = include unix nls @ISC_THREAD_DIR@ + TARGETS = timestamp + +-- +1.7.9.5 + 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 \ file://init.d-add-support-for-read-only-rootfs.patch \ file://bind9_9_5-CVE-2014-8500.patch \ file://bind-add-crosscripts-search-path-for-xml2-config.patch \ + file://bind-subdirs-run-serially.patch \ " SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e" @@ -48,7 +49,6 @@ INITSCRIPT_PARAMS = "defaults" SYSTEMD_SERVICE_${PN} = "named.service" -PARALLEL_MAKE = "" RDEPENDS_${PN} = "python-core" |