summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch30
-rw-r--r--meta/recipes-support/db/db_6.0.30.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch b/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch
new file mode 100644
index 0000000000..329bff5d3b
--- /dev/null
+++ b/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch
@@ -0,0 +1,30 @@
1From c640ff9340f358a00835816d0fea03d27a7be978 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 31 Mar 2015 00:56:44 -0700
4Subject: [PATCH] Makefile: let libso_target depend on bt_rec
5
6Fixed parallel issue:
7libtool: link: `bt_rec.lo' is not a valid libtool object
8Makefile:867: recipe for target 'libdb-6.0.la' failed
9make: *** [libdb-6.0.la] Error 1
10
11Upstream-Status: Pending
12
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14---
15 Makefile.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/Makefile.in b/Makefile.in
19index e451f70..0a42375 100644
20--- a/Makefile.in
21+++ b/Makefile.in
22@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS)
23 $(LN) -s $(libdb_version) $(libdb)
24
25 # Shared C library.
26-$(libso_target): $(C_OBJS)
27+$(libso_target): $(C_OBJS) bt_rec@o@
28 $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \
29 $(LIBCSO_LIBS)
30 $(RM) $(libdb)
diff --git a/meta/recipes-support/db/db_6.0.30.bb b/meta/recipes-support/db/db_6.0.30.bb
index 47fb296daa..9eae5c7a5e 100644
--- a/meta/recipes-support/db/db_6.0.30.bb
+++ b/meta/recipes-support/db/db_6.0.30.bb
@@ -18,6 +18,7 @@ RCONFLICTS_${PN} = "db3"
18SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" 18SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
19SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \ 19SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \
20 file://fix-parallel-build.patch \ 20 file://fix-parallel-build.patch \
21 file://Makefile-let-libso_target-depend-on-bt_rec.patch \
21 " 22 "
22 23
23SRC_URI[md5sum] = "ad28eb86ad3203b5422844db179c585b" 24SRC_URI[md5sum] = "ad28eb86ad3203b5422844db179c585b"