Patchwork [CONSOLIDATED,PULL,16/33] db: refactor packages for staticdev

login
register
mail settings
Submitter Saul Wold
Date Jan. 19, 2012, 9:22 a.m.
Message ID <d68959610269b2cb4d639df93bd6b0a782a7a158.1326964778.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/19717/
State Accepted
Commit ceeb10689f80cc86796d1ab32142aa1c4802eb84
Headers show

Comments

Saul Wold - Jan. 19, 2012, 9:22 a.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/db/db_5.1.19.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/meta/recipes-support/db/db_5.1.19.bb b/meta/recipes-support/db/db_5.1.19.bb
index 2659826..7e84646 100644
--- a/meta/recipes-support/db/db_5.1.19.bb
+++ b/meta/recipes-support/db/db_5.1.19.bb
@@ -14,7 +14,7 @@  HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
 LICENSE = "Sleepycat"
 VIRTUAL_NAME ?= "virtual/db"
 CONFLICTS = "db3"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
 SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.."
@@ -52,8 +52,8 @@  FILES_${PN} = "${libdir}/libdb-5*so*"
 FILES_${PN}-bin = "${bindir}/*"
 # The dev package has the .so link (as in db3) and the .a's -
 # it is therefore incompatible (cannot be installed at the
-# same time) as the db3 package
-FILES_${PN}-dev = "${includedir} ${libdir}/*"
+# same time) as the db3 package, allow the default packaging
+# to sort out ${libdir}
 
 #configuration - set in local.conf to override
 # All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix)