diff options
| -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 @@ | |||
| 1 | From b24468b6fe1f136bfd854773bc0e117aca0012d5 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
| 3 | Date: Wed, 28 Jan 2015 01:23:09 -0800 | ||
| 4 | Subject: [PATCH] lib/export/isc/Makefile.in: let SUBDIRS run serially | ||
| 5 | |||
| 6 | Fix parallel issue:: | ||
| 7 | make[2]: *** No rule to make target `nls/msgcat.o', needed by `libisc.a'. Stop. | ||
| 8 | make[2]: *** Waiting for unfinished jobs.... | ||
| 9 | make[3]: Leaving directory `bind-9.9.5/lib/export/isc/unix' | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
| 14 | --- | ||
| 15 | lib/export/isc/Makefile.in | 4 ++++ | ||
| 16 | 1 file changed, 4 insertions(+) | ||
| 17 | |||
| 18 | diff --git a/lib/export/isc/Makefile.in b/lib/export/isc/Makefile.in | ||
| 19 | index 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 | -- | ||
| 34 | 1.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 | ||
| 24 | SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e" | 25 | SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e" |
| @@ -48,7 +49,6 @@ INITSCRIPT_PARAMS = "defaults" | |||
| 48 | 49 | ||
| 49 | SYSTEMD_SERVICE_${PN} = "named.service" | 50 | SYSTEMD_SERVICE_${PN} = "named.service" |
| 50 | 51 | ||
| 51 | PARALLEL_MAKE = "" | ||
| 52 | 52 | ||
| 53 | RDEPENDS_${PN} = "python-core" | 53 | RDEPENDS_${PN} = "python-core" |
| 54 | 54 | ||
