diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-11-17 17:48:31 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:07 +0000 |
commit | 9e3781271dc0c6c4717aafb876ccab084e0a1eae (patch) | |
tree | 6138d784beda1133cac318e88cedfac1230234ca /meta/recipes-support/db/db | |
parent | c19036abc020a99bb2faa70df6c11ad42884b47d (diff) | |
download | poky-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/recipes-support/db/db')
-rw-r--r-- | meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch | 32 |
1 files changed, 32 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 @@ | |||
1 | From 2902dda6e3f7b2cd5796a96af20deece610e2eb9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Mon, 16 Nov 2015 22:20:49 -0800 | ||
4 | Subject: [PATCH] build_unix/Makefile: let libdb-6.0.la depend os_map.lo | ||
5 | |||
6 | Fixed parallel issue: | ||
7 | libtool: link: `os_map.lo' is not a valid libtool object | ||
8 | Makefile:867: recipe for target 'libdb-6.0.la' failed | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
13 | --- | ||
14 | dist/Makefile.in | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/dist/Makefile.in b/dist/Makefile.in | ||
18 | index 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 | -- | ||
31 | 1.7.9.5 | ||
32 | |||