summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/db/db
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
commit972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch)
tree97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-support/db/db
downloadpoky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-support/db/db')
-rw-r--r--meta/recipes-support/db/db/arm-thumb-mutex_db5.patch48
-rw-r--r--meta/recipes-support/db/db/fix-parallel-build.patch19
2 files changed, 67 insertions, 0 deletions
diff --git a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
new file mode 100644
index 0000000000..34e8db84df
--- /dev/null
+++ b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
@@ -0,0 +1,48 @@
1Original patch submitted by jbowler@nslu2-linux.org on 2005-11-17:
2
3db: fix thumb uclibc operation in 4.3.29
4 - uclibc thumb builds were using libpthread to implement mutexes, the
5 - uclibc version seems to be a stub (at least on thumb). This commit
6 - fixes the ARM/gcc-assembly mutex implementation so that it has thumb
7 - support and the resultant db4 works (tested on LE Thumb uclibc)
8
9Upstream-Status: Inappropriate [embedded specific]
10
11Author: jbowler@nslu2-linux.org
12
13--- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600
14+++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600
15@@ -474,6 +474,25 @@
16
17 #ifdef LOAD_ACTUAL_MUTEX_CODE
18 /* gcc/arm: 0 is clear, 1 is set. */
19+#if defined __thumb__
20+#define MUTEX_SET(tsl) ({ \
21+ int __r, __p; \
22+ __asm__ volatile( \
23+ ".align 2\n\t" \
24+ "bx pc\n\t" \
25+ "nop\n\t" \
26+ ".arm\n\t" \
27+ "swpb %0, %2, [%3]\n\t" \
28+ "eor %0, %0, #1\n\t" \
29+ "orr %1, pc, #1\n\t" \
30+ "bx %1\n\t" \
31+ ".force_thumb" \
32+ : "=&r" (__r), "=r" (__p) \
33+ : "r" (1), "r" (tsl) \
34+ ); \
35+ __r & 1; \
36+})
37+#else
38 #define MUTEX_SET(tsl) ({ \
39 int __r; \
40 __asm__ volatile( \
41@@ -484,6 +503,7 @@
42 ); \
43 __r & 1; \
44 })
45+#endif
46
47 #define MUTEX_UNSET(tsl) (*(volatile tsl_t *)(tsl) = 0)
48 #define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)
diff --git a/meta/recipes-support/db/db/fix-parallel-build.patch b/meta/recipes-support/db/db/fix-parallel-build.patch
new file mode 100644
index 0000000000..2c7f1e186b
--- /dev/null
+++ b/meta/recipes-support/db/db/fix-parallel-build.patch
@@ -0,0 +1,19 @@
1With higher paralelism it sometimes fails with:
2libtool: link: `util_log.lo' is not a valid libtool object
3make: *** [db_replicate] Error 1
4
5Upstream-Status: Pending
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8
9--- dist.orig/Makefile.in 2012-05-11 19:57:48.000000000 +0200
10+++ dist/Makefile.in 2013-10-31 18:17:11.875532522 +0100
11@@ -1034,7 +1034,7 @@
12 db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
13 $(POSTLINK) $@
14
15-db_replicate: db_replicate@o@ util_sig@o@ $(DEF_LIB)
16+db_replicate: db_replicate@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
17 $(CCLINK) -o $@ $(LDFLAGS) \
18 db_replicate@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
19 $(POSTLINK) $@