From 441006cc6f921178cc13f9da76e5bcfee45d472a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 13 Jan 2010 23:04:55 +0000 Subject: db: Convert to BBCLASSEXTEND Signed-off-by: Richard Purdie --- meta/packages/db/db-native_4.2.52.bb | 11 --------- meta/packages/db/db/arm-thumb-mutex.patch | 36 ++++++++++++++++++++++++++++ meta/packages/db/db/configure_fixes.patch | 18 ++++++++++++++ meta/packages/db/db_4.2.52.bb | 7 +++++- meta/packages/db/files/arm-thumb-mutex.patch | 36 ---------------------------- meta/packages/db/files/configure_fixes.patch | 18 -------------- 6 files changed, 60 insertions(+), 66 deletions(-) delete mode 100644 meta/packages/db/db-native_4.2.52.bb create mode 100644 meta/packages/db/db/arm-thumb-mutex.patch create mode 100644 meta/packages/db/db/configure_fixes.patch delete mode 100644 meta/packages/db/files/arm-thumb-mutex.patch delete mode 100644 meta/packages/db/files/configure_fixes.patch diff --git a/meta/packages/db/db-native_4.2.52.bb b/meta/packages/db/db-native_4.2.52.bb deleted file mode 100644 index 9dfcd1e267..0000000000 --- a/meta/packages/db/db-native_4.2.52.bb +++ /dev/null @@ -1,11 +0,0 @@ -# This wrapper builds a native version of the SleepyCat -# Berkeley DB for those packages which need it (e.g. -# perl). -SECTION = "libs" -VIRTUAL_NAME = "virtual/db-native" -CONFLICTS = "db3-native" -#PR tracks the non-native package - -require db_${PV}.bb - -inherit native diff --git a/meta/packages/db/db/arm-thumb-mutex.patch b/meta/packages/db/db/arm-thumb-mutex.patch new file mode 100644 index 0000000000..acd446fcd8 --- /dev/null +++ b/meta/packages/db/db/arm-thumb-mutex.patch @@ -0,0 +1,36 @@ +--- 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/packages/db/db/configure_fixes.patch b/meta/packages/db/db/configure_fixes.patch new file mode 100644 index 0000000000..80aa0e7c1c --- /dev/null +++ b/meta/packages/db/db/configure_fixes.patch @@ -0,0 +1,18 @@ +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 &1 &6 - else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. --case `"$LD" -v 2>&1 &1