diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2011-01-15 21:14:46 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-27 21:53:24 +0000 |
| commit | e77207ccdf15f34651a086099ed4816712e3656b (patch) | |
| tree | 985194b5787bc01a278c1a68e8c347a03e5d609e /meta/recipes-support/db/db | |
| parent | 156405e57871d2339c99fc9b0ef58f0ee9b24e2e (diff) | |
| download | openembedded-core-e77207ccdf15f34651a086099ed4816712e3656b.tar.gz | |
BerkleyDB: Uprev db from 4.2 to 5.1.19
The latest version of Berkley DB (5.1.19) is required by RPM. This version
is backwards compatible with the 4.2 version that was enabled previously.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-support/db/db')
| -rw-r--r-- | meta/recipes-support/db/db/arm-thumb-mutex.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-support/db/db/arm-thumb-mutex_db5.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-support/db/db/configure_fixes.patch | 18 |
3 files changed, 36 insertions, 54 deletions
diff --git a/meta/recipes-support/db/db/arm-thumb-mutex.patch b/meta/recipes-support/db/db/arm-thumb-mutex.patch deleted file mode 100644 index acd446fcd8..0000000000 --- a/meta/recipes-support/db/db/arm-thumb-mutex.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- db-4.3.29-dist/../dbinc/mutex.h 2005-11-15 07:33:27.761042518 -0800 -+++ db-4.3.29-dist/../dbinc/mutex.h 2005-11-15 07:55:24.823920060 -0800 -@@ -470,6 +470,25 @@ - #ifdef LOAD_ACTUAL_MUTEX_CODE - #define MUTEX_SET_TEST 1 /* gcc/arm: 0 is clear, 1 is set. */ - -+#if defined __thumb__ -+#define MUTEX_SET(tsl) ({ \ -+ int __r, __p; \ -+ asm volatile( \ -+ ".align 2\n\t" \ -+ "bx pc\n\t" \ -+ "nop\n\t" \ -+ ".arm\n\t" \ -+ "swpb %0, %2, [%3]\n\t" \ -+ "eor %0, %0, #1\n\t" \ -+ "orr %1, pc, #1\n\t" \ -+ "bx %1\n\t" \ -+ ".force_thumb" \ -+ : "=&r" (__r), "=r" (__p) \ -+ : "r" (1), "r" (tsl) \ -+ ); \ -+ __r & 1; \ -+}) -+#else - #define MUTEX_SET(tsl) ({ \ - int __r; \ - asm volatile( \ -@@ -480,6 +499,7 @@ - ); \ - __r & 1; \ - }) -+#endif - - #define MUTEX_UNSET(tsl) (*(volatile tsl_t *)(tsl) = 0) - #define MUTEX_INIT(tsl) MUTEX_UNSET(tsl) 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..37d0d93abd --- /dev/null +++ b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch @@ -0,0 +1,36 @@ +--- db-5.1.19/../src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600 ++++ db-5.1.19/../src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600 +@@ -474,6 +474,25 @@ + + #ifdef LOAD_ACTUAL_MUTEX_CODE + /* gcc/arm: 0 is clear, 1 is set. */ ++#if defined __thumb__ ++#define MUTEX_SET(tsl) ({ \ ++ int __r, __p; \ ++ __asm__ volatile( \ ++ ".align 2\n\t" \ ++ "bx pc\n\t" \ ++ "nop\n\t" \ ++ ".arm\n\t" \ ++ "swpb %0, %2, [%3]\n\t" \ ++ "eor %0, %0, #1\n\t" \ ++ "orr %1, pc, #1\n\t" \ ++ "bx %1\n\t" \ ++ ".force_thumb" \ ++ : "=&r" (__r), "=r" (__p) \ ++ : "r" (1), "r" (tsl) \ ++ ); \ ++ __r & 1; \ ++}) ++#else + #define MUTEX_SET(tsl) ({ \ + int __r; \ + __asm__ volatile( \ +@@ -484,6 +503,7 @@ + ); \ + __r & 1; \ + }) ++#endif + + #define MUTEX_UNSET(tsl) (*(volatile tsl_t *)(tsl) = 0) + #define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0) diff --git a/meta/recipes-support/db/db/configure_fixes.patch b/meta/recipes-support/db/db/configure_fixes.patch deleted file mode 100644 index 80aa0e7c1c..0000000000 --- a/meta/recipes-support/db/db/configure_fixes.patch +++ /dev/null @@ -1,18 +0,0 @@ -If LD is a binary name + parameters db will fail to work out its GNU ld -and disable shared libraries. We don't want this. - -RP - 22/11/2007 - -Index: dist/configure -=================================================================== ---- dist.orig/configure 2007-11-23 00:47:27.000000000 +0000 -+++ dist/configure 2007-11-23 00:53:22.000000000 +0000 -@@ -5658,7 +5661,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. --case `"$LD" -v 2>&1 </dev/null` in -+case `$LD -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; |