summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-11-17 17:48:31 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:07 +0000
commit9e3781271dc0c6c4717aafb876ccab084e0a1eae (patch)
tree6138d784beda1133cac318e88cedfac1230234ca /meta
parentc19036abc020a99bb2faa70df6c11ad42884b47d (diff)
downloadpoky-9e3781271dc0c6c4717aafb876ccab084e0a1eae.tar.gz
db: fix race issue for libdb-6.0.la
Fixed: libtool: link: `os_map.lo' is not a valid libtool object Makefile:867: recipe for target 'libdb-6.0.la' failed (From OE-Core rev: 5e0f27bd0d00dd9aa597d98d0a7d5b4f5d726925) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch32
-rw-r--r--meta/recipes-support/db/db_6.0.30.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch b/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch
new file mode 100644
index 0000000000..d4c6bb8e05
--- /dev/null
+++ b/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch
@@ -0,0 +1,32 @@
1From 2902dda6e3f7b2cd5796a96af20deece610e2eb9 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 16 Nov 2015 22:20:49 -0800
4Subject: [PATCH] build_unix/Makefile: let libdb-6.0.la depend os_map.lo
5
6Fixed parallel issue:
7libtool: link: `os_map.lo' is not a valid libtool object
8Makefile:867: recipe for target 'libdb-6.0.la' failed
9
10Upstream-Status: Pending
11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13---
14 dist/Makefile.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/dist/Makefile.in b/dist/Makefile.in
18index 0a42375..d9e05b9 100644
19--- a/dist/Makefile.in
20+++ b/dist/Makefile.in
21@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS)
22 $(LN) -s $(libdb_version) $(libdb)
23
24 # Shared C library.
25-$(libso_target): $(C_OBJS) bt_rec@o@
26+$(libso_target): $(C_OBJS) bt_rec@o@ os_map@o@
27 $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \
28 $(LIBCSO_LIBS)
29 $(RM) $(libdb)
30--
311.7.9.5
32
diff --git a/meta/recipes-support/db/db_6.0.30.bb b/meta/recipes-support/db/db_6.0.30.bb
index d49df62b9a..ccdb6bd302 100644
--- a/meta/recipes-support/db/db_6.0.30.bb
+++ b/meta/recipes-support/db/db_6.0.30.bb
@@ -21,6 +21,7 @@ SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
21SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \ 21SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \
22 file://fix-parallel-build.patch \ 22 file://fix-parallel-build.patch \
23 file://Makefile-let-libso_target-depend-on-bt_rec.patch \ 23 file://Makefile-let-libso_target-depend-on-bt_rec.patch \
24 file://Makefile-let-libdb-6.0.la-depend-os_map.l.patch;patchdir=.. \
24 " 25 "
25 26
26SRC_URI[md5sum] = "ad28eb86ad3203b5422844db179c585b" 27SRC_URI[md5sum] = "ad28eb86ad3203b5422844db179c585b"