summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch')
-rw-r--r--meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch48
1 files changed, 0 insertions, 48 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
deleted file mode 100644
index 8bc4ea30f8..0000000000
--- a/meta/recipes-connectivity/bind/bind/bind-confgen-build-unix.o-once.patch
+++ /dev/null
@@ -1,48 +0,0 @@
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
21Update context(trailing whitespace) for version 9.10.5-P3.
22
23Signed-off-by: Kai Kang <kai.kang@windriver.com>
24---
25 bin/confgen/Makefile.in | 4 ++--
26 1 file changed, 2 insertions(+), 2 deletions(-)
27
28diff --git a/bin/confgen/Makefile.in b/bin/confgen/Makefile.in
29index dca272f..02becce 100644
30--- a/bin/confgen/Makefile.in
31+++ b/bin/confgen/Makefile.in
32@@ -74,11 +74,11 @@ rndc-confgen.@O@: rndc-confgen.c
33 ddns-confgen.@O@: ddns-confgen.c
34 ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} -c ${srcdir}/ddns-confgen.c
35
36-rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS}
37+rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS} $(SUBDIRS)
38 export BASEOBJS="rndc-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \
39 ${FINALBUILDCMD}
40
41-ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS} ${CONFDEPLIBS}
42+ddns-confgen@EXEEXT@: ddns-confgen.@O@ util.@O@ keygen.@O@ ${CONFDEPLIBS} $(SUBDIRS)
43 export BASEOBJS="ddns-confgen.@O@ util.@O@ keygen.@O@ ${UOBJS}"; \
44 ${FINALBUILDCMD}
45
46--
471.7.9.5
48