From: Tom Rini <tom_rini@mentor.com>
Date: Wed, 16 Mar 2011 17:54:50 +0000 (-0700)
Subject: db: Rework arm-thumb-mutex_db5.patch
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e35caa4763fab8f526c278437db7d8980a22d16d;p=openembedded.git

db: Rework arm-thumb-mutex_db5.patch

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---

diff --git a/recipes/db/db-5.1.19/arm-thumb-mutex_db5.patch b/recipes/db/db-5.1.19/arm-thumb-mutex_db5.patch
index 37d0d93abd..51d485499e 100644
--- a/recipes/db/db-5.1.19/arm-thumb-mutex_db5.patch
+++ b/recipes/db/db-5.1.19/arm-thumb-mutex_db5.patch
@@ -1,5 +1,5 @@
---- 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
+--- 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
diff --git a/recipes/db/db_5.1.19.bb b/recipes/db/db_5.1.19.bb
index c44b958f75..9c25876706 100644
--- a/recipes/db/db_5.1.19.bb
+++ b/recipes/db/db_5.1.19.bb
@@ -14,10 +14,10 @@ HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
 LICENSE = "BSD Sleepycat"
 VIRTUAL_NAME ?= "virtual/db"
 CONFLICTS = "db3"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
-SRC_URI += "file://arm-thumb-mutex_db5.patch"
+SRC_URI += "file://arm-thumb-mutex_db5.patch;apply=false"
 
 SRC_URI[md5sum] = "76fcbfeebfcd09ba0b4d96bfdf8d884d"
 SRC_URI[sha256sum] = "0194d4ca9266ba1a1c0bfbc233b18bfd05f63163453c81ebcdfdc7112d5ac850"
@@ -74,6 +74,8 @@ EXTRA_OECONF += "${MUTEX}"
 # configure.
 CONFIG_SITE = ""
 do_configure() {
+	# Apply this patch in the correct spot
+	(cd .. ; patch -p1 -i ${WORKDIR}/arm-thumb-mutex_db5.patch)
 	oe_runconf
 }