mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-04 14:09:47 +00:00
Code Issues Projects Releases Wiki Activity

db: fix race issue for libdb-6.0.la

Browse Source 
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>
This commit is contained in:
Robert Yang
2015-11-17 17:48:31 -08:00
committed by Richard Purdie
parent c19036abc0
commit 9e3781271d
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch
+32
View File
@@ -0,0 +1,32 @@
From 2902dda6e3f7b2cd5796a96af20deece610e2eb9 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Mon, 16 Nov 2015 22:20:49 -0800
Subject: [PATCH] build_unix/Makefile: let libdb-6.0.la depend os_map.lo
Fixed parallel issue:
libtool: link: `os_map.lo' is not a valid libtool object
Makefile:867: recipe for target 'libdb-6.0.la' failed
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
dist/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dist/Makefile.in b/dist/Makefile.in
index 0a42375..d9e05b9 100644
--- a/dist/Makefile.in
+++ b/dist/Makefile.in
@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS)
$(LN) -s $(libdb_version) $(libdb)
# Shared C library.
-$(libso_target): $(C_OBJS) bt_rec@o@
+$(libso_target): $(C_OBJS) bt_rec@o@ os_map@o@
$(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \
$(LIBCSO_LIBS)
$(RM) $(libdb)
--
1.7.9.5
meta/recipes-support/db/db_6.0.30.bb
+1
View File
@@ -21,6 +21,7 @@ SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \
file://fix-parallel-build.patch \
file://Makefile-let-libso_target-depend-on-bt_rec.patch \
file://Makefile-let-libdb-6.0.la-depend-os_map.l.patch;patchdir=.. \
"
SRC_URI[md5sum] = "ad28eb86ad3203b5422844db179c585b"