summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bind/bind
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-02-17 19:28:43 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-19 07:51:39 +0000
commit32018182f32856931fe77ba5c4dda6e6e99327a4 (patch)
treeda563dd3f6fb803f0defe56871cfab46b5b49c08 /meta/recipes-connectivity/bind/bind
parent285966f337ce8a191cbd870c004dd4822be9821a (diff)
downloadpoky-32018182f32856931fe77ba5c4dda6e6e99327a4.tar.gz
bind: Fix parallel make issue
Fixed: unix/os.o: file not recognized: File truncated collect2: error: ld returned 1 exit status This is because os.o was built twice: * The implicity rule (depends on unix/os.o) * The "make all" in unix subdir (depends on unix/os.o) Depend on subdirs which is unix only rather than unix/os.o will fix the problem. (From OE-Core rev: 1af699e1af2552659b90a1fadd8de73d780226ba) 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/bind')
-rw-r--r--meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch b/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
new file mode 100644
index 0000000000..096d5d84fc
--- /dev/null
+++ b/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
@@ -0,0 +1,44 @@
1From 9b40619ff6fddfef2758ba797789f8487f412df3 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 16 Feb 2015 00:50:01 -0800
4Subject: [PATCH] confgen: don't build unix.o twice
5
6Fixed:
7unix/os.o: file not recognized: File truncated
8collect2: error: ld returned 1 exit status
9
10This is because os.o was built twice:
11* The implicity rule (depends on unix/os.o)
12* The "make all" in unix subdir (depends on unix/os.o)
13
14Depend on subdirs which is unix only rather than unix/os.o will fix the
15problem.
16
17Upstream-Status: Pending
18
19Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
20---
21 bin/confgen/Makefile.in | 4 ++--
22 1 file changed, 2 insertions(+), 2 deletions(-)
23
24diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
25index 8b3e5aa..4868a24 100644
26--- a/bin/confgen/Makefile.in
27+++ b/bin/confgen/Makefile.in
28@@ -74,11 +74,11 @@ rndc-confgen.@O@: rndc-confgen.c
29 ddns-confgen.@O@: ddns-confgen.c
30 ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c ${srcdir}/ddns-confgen.c
31
32-rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS}
33+rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS} $(SUBDIRS)
34 export BASEOBJS="rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \
35 ${FINALBUILDCMD}
36
37-ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS}
38+ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS} $(SUBDIRS)
39 export BASEOBJS="ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \
40 ${FINALBUILDCMD}
41
42--
431.7.9.5
44