summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/db/db
diff options
context:
space:
mode:
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.patch29
-rw-r--r--meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch30
2 files changed, 0 insertions, 59 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
deleted file mode 100644
index 68a213136b..0000000000
--- a/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch
+++ /dev/null
@@ -1,29 +0,0 @@
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
17Index: db-6.0.30/dist/Makefile.in
18===================================================================
19--- db-6.0.30.orig/dist/Makefile.in
20+++ db-6.0.30/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)
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
deleted file mode 100644
index 8680408347..0000000000
--- a/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch
+++ /dev/null
@@ -1,30 +0,0 @@
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
18Index: db-6.0.30/dist/Makefile.in
19===================================================================
20--- db-6.0.30.orig/dist/Makefile.in
21+++ db-6.0.30/dist/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)