summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-07-02 19:57:43 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-08 11:20:12 +0100
commit107ef516a6b5dc8f6e4606d30e8fa204d75f0b21 (patch)
treed454a72d773beb8b2f76bd5e79bee36b92becc8a
parente73deac6dc7861c64ced49d2a35f781d655db79a (diff)
downloadpoky-107ef516a6b5dc8f6e4606d30e8fa204d75f0b21.tar.gz
db: Add version 6.0.30
The latest version of RPM5 requires Berkley DB 6.0.20 or newer. The license is now AGPL-3.0 in BDB 6.0. This may not be acceptable to some, so the previous version is retained as an alternative. (From OE-Core rev: 04bb223110da2f92725c341bc3ec0cf26325f675) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/db/db/arm-thumb-mutex_db5.patch10
-rw-r--r--meta/recipes-support/db/db_6.0.30.bb114
2 files changed, 124 insertions, 0 deletions
diff --git a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
index 40b13dee79..34e8db84df 100644
--- a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
+++ b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
@@ -1,5 +1,15 @@
1Original patch submitted by jbowler@nslu2-linux.org on 2005-11-17:
2
3db: fix thumb uclibc operation in 4.3.29
4 - uclibc thumb builds were using libpthread to implement mutexes, the
5 - uclibc version seems to be a stub (at least on thumb). This commit
6 - fixes the ARM/gcc-assembly mutex implementation so that it has thumb
7 - support and the resultant db4 works (tested on LE Thumb uclibc)
8
1Upstream-Status: Inappropriate [embedded specific] 9Upstream-Status: Inappropriate [embedded specific]
2 10
11Author: jbowler@nslu2-linux.org
12
3--- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600 13--- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600
4+++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600 14+++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600
5@@ -474,6 +474,25 @@ 15@@ -474,6 +474,25 @@
diff --git a/meta/recipes-support/db/db_6.0.30.bb b/meta/recipes-support/db/db_6.0.30.bb
new file mode 100644
index 0000000000..9fc4a30a88
--- /dev/null
+++ b/meta/recipes-support/db/db_6.0.30.bb
@@ -0,0 +1,114 @@
1# Version 6 of the Berkeley DB from Oracle (formerly Sleepycat)
2#
3# At present this package only installs the DB code
4# itself (shared libraries, .a in the dev package),
5# documentation and headers.
6#
7# The headers have the same names as those as v3
8# of the DB, only one version can be used *for dev*
9# at once - DB3 and DB6 can both be installed on the
10# same system at the same time if really necessary.
11SECTION = "libs"
12SUMMARY = "Berkeley Database v6"
13HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
14LICENSE = "AGPL-3.0"
15VIRTUAL_NAME ?= "virtual/db"
16RCONFLICTS_${PN} = "db3"
17
18SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
19SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \
20 file://fix-parallel-build.patch \
21 "
22
23SRC_URI[md5sum] = "ad28eb86ad3203b5422844db179c585b"
24SRC_URI[sha256sum] = "608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2"
25
26LIC_FILES_CHKSUM = "file://../LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490"
27
28inherit autotools
29
30# Put virtual/db in any appropriate provider of a
31# relational database, use it as a dependency in
32# place of a specific db and use:
33#
34# PREFERRED_PROVIDER_virtual/db
35#
36# to select the correct db in the build (distro) .conf
37PROVIDES += "${VIRTUAL_NAME}"
38
39# bitbake isn't quite clever enough to deal with sleepycat,
40# the distribution sits in the expected directory, but all
41# the builds must occur from a sub-directory. The following
42# persuades bitbake to go to the right place
43S = "${WORKDIR}/db-${PV}/dist"
44B = "${WORKDIR}/db-${PV}/build_unix"
45
46# The executables go in a separate package - typically there
47# is no need to install these unless doing real database
48# management on the system.
49inherit lib_package
50
51PACKAGES =+ "${PN}-cxx"
52FILES_${PN}-cxx = "${libdir}/*cxx*so"
53
54
55# The dev package has the .so link (as in db3) and the .a's -
56# it is therefore incompatible (cannot be installed at the
57# same time) as the db3 package
58# sort out the .so since they do version prior to the .so
59SOLIBS = "-6*.so"
60FILES_SOLIBSDEV = "${libdir}/libdb.so ${libdir}/libdb_cxx.so"
61
62#configuration - set in local.conf to override
63# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix)
64DB6_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql"
65
66EXTRA_OECONF = "${DB6_CONFIG} --enable-shared --enable-cxx --with-sysroot"
67
68# Override the MUTEX setting here, the POSIX library is
69# the default - "POSIX/pthreads/library".
70# Don't ignore the nice SWP instruction on the ARM:
71# These enable the ARM assembler mutex code
72ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
73MUTEX = ""
74MUTEX_arm = "${ARM_MUTEX}"
75MUTEX_armeb = "${ARM_MUTEX}"
76EXTRA_OECONF += "${MUTEX}"
77
78# Cancel the site stuff - it's set for db3 and destroys the
79# configure.
80CONFIG_SITE = ""
81do_configure() {
82 gnu-configize --force ${S}
83 export STRIP="true"
84 oe_runconf
85}
86
87do_compile_prepend() {
88 sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' \
89 ${B}/libtool
90}
91
92do_install_append() {
93 mkdir -p ${D}/${includedir}/db60
94 mv ${D}/${includedir}/db.h ${D}/${includedir}/db60/.
95 mv ${D}/${includedir}/db_cxx.h ${D}/${includedir}/db60/.
96 ln -s db60/db.h ${D}/${includedir}/db.h
97 ln -s db60/db_cxx.h ${D}/${includedir}/db_cxx.h
98
99 # The docs end up in /usr/docs - not right.
100 if test -d "${D}/${prefix}/docs"
101 then
102 mkdir -p "${D}/${datadir}"
103 test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
104 mv "${D}/${prefix}/docs" "${D}/${docdir}"
105 fi
106
107 chown -R root:root ${D}
108}
109
110INSANE_SKIP_${PN} = "dev-so"
111INSANE_SKIP_${PN}-cxx = "dev-so"
112
113BBCLASSEXTEND = "native nativesdk"
114