summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/db
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2013-12-29 13:27:38 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-06 11:12:32 +0000
commita484b35b818768487ff27cf06b8c5d4e128126af (patch)
tree819b1bf4c2137ecd3a4d5a31532322aaffe89075 /meta/recipes-support/db
parent45bb0364e5f97e7d99b494df8d13e7f58265159f (diff)
downloadopenembedded-core-a484b35b818768487ff27cf06b8c5d4e128126af.tar.gz
openembedded-core-a484b35b818768487ff27cf06b8c5d4e128126af.tar.bz2
openembedded-core-a484b35b818768487ff27cf06b8c5d4e128126af.zip
db : Include C++ binding library in Berkeley DB recipe.
Create the C++ library for db. This library is packaged in a new package so the db package only contains the c library. This prevents existing users from adding libstdc++ to the package DEPENDS. Signed-off-by: Philip Balister <philip@balister.org> Signed-off-by: Douglas Geiger <doug.geiger@bioradiation.net> Signed-off-by: Steve Arnold <esteve@gentoogeek.org> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/db')
-rw-r--r--meta/recipes-support/db/db_5.3.21.bb21
1 files changed, 14 insertions, 7 deletions
diff --git a/meta/recipes-support/db/db_5.3.21.bb b/meta/recipes-support/db/db_5.3.21.bb
index 608d406e72..8ec887007a 100644
--- a/meta/recipes-support/db/db_5.3.21.bb
+++ b/meta/recipes-support/db/db_5.3.21.bb
@@ -17,7 +17,8 @@ RCONFLICTS_${PN} = "db3"
SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \
- file://fix-parallel-build.patch"
+ file://fix-parallel-build.patch \
+ "
SRC_URI[md5sum] = "3fda0b004acdaa6fa350bfc41a3b95ca"
SRC_URI[sha256sum] = "ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8"
@@ -47,18 +48,22 @@ B = "${WORKDIR}/db-${PV}/build_unix"
# management on the system.
inherit lib_package
+PACKAGES =+ "${PN}-cxx"
+FILES_${PN}-cxx = "${libdir}/*cxx*so"
+
+
# 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
# sort out the .so since they do version prior to the .so
SOLIBS = "-5*.so"
-FILES_SOLIBSDEV = "${libdir}/libdb.so"
+FILES_SOLIBSDEV = "${libdir}/libdb.so ${libdir}/libdb_cxx.so"
#configuration - set in local.conf to override
# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix)
DB5_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql"
-EXTRA_OECONF = "${DB5_CONFIG}"
+EXTRA_OECONF = "${DB5_CONFIG} --enable-shared --enable-cxx"
# Override the MUTEX setting here, the POSIX library is
# the default - "POSIX/pthreads/library".
@@ -80,16 +85,17 @@ do_configure() {
oe_runconf
}
+do_compile_prepend() {
+ sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' \
+ ${B}/libtool
+}
+
do_install_append() {
mkdir -p ${D}/${includedir}/db51
- #mv ${D}/${includedir}/db_185.h ${D}/${includedir}/db51/.
mv ${D}/${includedir}/db.h ${D}/${includedir}/db51/.
mv ${D}/${includedir}/db_cxx.h ${D}/${includedir}/db51/.
- #mv ${D}/${includedir}/dbsql.h ${D}/${includedir}/db51/.
- #ln -s db51/db_185.h ${D}/${includedir}/db_185.h
ln -s db51/db.h ${D}/${includedir}/db.h
ln -s db51/db_cxx.h ${D}/${includedir}/db_cxx.h
- #ln -s db51/dbsql.h ${D}/${includedir}/dbsql.h
# The docs end up in /usr/docs - not right.
if test -d "${D}/${prefix}/docs"
@@ -103,6 +109,7 @@ do_install_append() {
}
INSANE_SKIP_${PN} = "dev-so"
+INSANE_SKIP_${PN}-cxx = "dev-so"
BBCLASSEXTEND = "native nativesdk"