summaryrefslogtreecommitdiffstats
path: root/meta
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:14:02 +0000
commit23f29027db73d5759889b48fabdea7f6173217a7 (patch)
treed4920e9abc7807974c1e03310f2aa02740acd371 /meta
parent03435469e2030e40a5e9d29821f9bc68d39cc03f (diff)
downloadpoky-23f29027db73d5759889b48fabdea7f6173217a7.tar.gz
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. (From OE-Core rev: a484b35b818768487ff27cf06b8c5d4e128126af) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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"
17 17
18SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" 18SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
19SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \ 19SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \
20 file://fix-parallel-build.patch" 20 file://fix-parallel-build.patch \
21 "
21 22
22SRC_URI[md5sum] = "3fda0b004acdaa6fa350bfc41a3b95ca" 23SRC_URI[md5sum] = "3fda0b004acdaa6fa350bfc41a3b95ca"
23SRC_URI[sha256sum] = "ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8" 24SRC_URI[sha256sum] = "ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8"
@@ -47,18 +48,22 @@ B = "${WORKDIR}/db-${PV}/build_unix"
47# management on the system. 48# management on the system.
48inherit lib_package 49inherit lib_package
49 50
51PACKAGES =+ "${PN}-cxx"
52FILES_${PN}-cxx = "${libdir}/*cxx*so"
53
54
50# The dev package has the .so link (as in db3) and the .a's - 55# The dev package has the .so link (as in db3) and the .a's -
51# it is therefore incompatible (cannot be installed at the 56# it is therefore incompatible (cannot be installed at the
52# same time) as the db3 package 57# same time) as the db3 package
53# sort out the .so since they do version prior to the .so 58# sort out the .so since they do version prior to the .so
54SOLIBS = "-5*.so" 59SOLIBS = "-5*.so"
55FILES_SOLIBSDEV = "${libdir}/libdb.so" 60FILES_SOLIBSDEV = "${libdir}/libdb.so ${libdir}/libdb_cxx.so"
56 61
57#configuration - set in local.conf to override 62#configuration - set in local.conf to override
58# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix) 63# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix)
59DB5_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql" 64DB5_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql"
60 65
61EXTRA_OECONF = "${DB5_CONFIG}" 66EXTRA_OECONF = "${DB5_CONFIG} --enable-shared --enable-cxx"
62 67
63# Override the MUTEX setting here, the POSIX library is 68# Override the MUTEX setting here, the POSIX library is
64# the default - "POSIX/pthreads/library". 69# the default - "POSIX/pthreads/library".
@@ -80,16 +85,17 @@ do_configure() {
80 oe_runconf 85 oe_runconf
81} 86}
82 87
88do_compile_prepend() {
89 sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' \
90 ${B}/libtool
91}
92
83do_install_append() { 93do_install_append() {
84 mkdir -p ${D}/${includedir}/db51 94 mkdir -p ${D}/${includedir}/db51
85 #mv ${D}/${includedir}/db_185.h ${D}/${includedir}/db51/.
86 mv ${D}/${includedir}/db.h ${D}/${includedir}/db51/. 95 mv ${D}/${includedir}/db.h ${D}/${includedir}/db51/.
87 mv ${D}/${includedir}/db_cxx.h ${D}/${includedir}/db51/. 96 mv ${D}/${includedir}/db_cxx.h ${D}/${includedir}/db51/.
88 #mv ${D}/${includedir}/dbsql.h ${D}/${includedir}/db51/.
89 #ln -s db51/db_185.h ${D}/${includedir}/db_185.h
90 ln -s db51/db.h ${D}/${includedir}/db.h 97 ln -s db51/db.h ${D}/${includedir}/db.h
91 ln -s db51/db_cxx.h ${D}/${includedir}/db_cxx.h 98 ln -s db51/db_cxx.h ${D}/${includedir}/db_cxx.h
92 #ln -s db51/dbsql.h ${D}/${includedir}/dbsql.h
93 99
94 # The docs end up in /usr/docs - not right. 100 # The docs end up in /usr/docs - not right.
95 if test -d "${D}/${prefix}/docs" 101 if test -d "${D}/${prefix}/docs"
@@ -103,6 +109,7 @@ do_install_append() {
103} 109}
104 110
105INSANE_SKIP_${PN} = "dev-so" 111INSANE_SKIP_${PN} = "dev-so"
112INSANE_SKIP_${PN}-cxx = "dev-so"
106 113
107BBCLASSEXTEND = "native nativesdk" 114BBCLASSEXTEND = "native nativesdk"
108 115