db: revert deletion of do_stage() applied in cb4bdb355a7ab7751886b88c8857c5f64fcfd84f

diff --git a/packages/db/db_4.3.29.bb b/packages/db/db_4.3.29.bb
index 42f6e19..8671efe 100644 (file)
--- a/packages/db/db_4.3.29.bb
+++ b/packages/db/db_4.3.29.bb
@@ -14,7 +14,7 @@ HOMEPAGE = "http://www.sleepycat.com"
 LICENSE = "BSD Sleepycat"
 VIRTUAL_NAME ?= "virtual/db"
 CONFLICTS = "db3"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
 #SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
@@ -74,10 +74,14 @@ do_configure() {
 }
 
 do_stage() {
-       autotools_stage_all
-       # the following is required by (at least) bogofilter
-       # configure, can be removed when all package configures
-       # do the correct search for db versions.
+       # The .h files get installed read-only, the autostage
+       # function just uses cp -pPR, so do this by hand
+       rm -rf ${STAGE_TEMP}
+       mkdir -p ${STAGE_TEMP}
+       oe_runmake DESTDIR="${STAGE_TEMP}" install_include
+       cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
+       rm -rf ${STAGE_TEMP}
+       oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR}
        ln -sf libdb-4.3.so ${STAGING_LIBDIR}/libdb.so
        ln -sf libdb-4.3.a ${STAGING_LIBDIR}/libdb.a
 }