summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/default-versions.inc3
-rw-r--r--meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch29
-rw-r--r--meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch30
-rw-r--r--meta/recipes-support/db/db_5.3.28.bb1
-rw-r--r--meta/recipes-support/db/db_6.0.35.bb111
5 files changed, 1 insertions, 173 deletions
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index cc8c533d4c..d976508ff5 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -5,6 +5,3 @@
5# Force the older version of liberation-fonts until we fix the fontforge issue 5# Force the older version of liberation-fonts until we fix the fontforge issue
6PREFERRED_VERSION_liberation-fonts ?= "1.04" 6PREFERRED_VERSION_liberation-fonts ?= "1.04"
7 7
8# Force db-native's version to keep sync with db while
9# 'AGPL-3.0' in ${INCOMPATIBLE_LICENSE} blacklist
10PREFERRED_VERSION_db-native = "${@incompatible_license_contains('AGPL-3.0', '5.%', '6.%', d)}"
diff --git a/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch b/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch
deleted file mode 100644
index 68a213136b..0000000000
--- a/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 2902dda6e3f7b2cd5796a96af20deece610e2eb9 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 16 Nov 2015 22:20:49 -0800
4Subject: [PATCH] build_unix/Makefile: let libdb-6.0.la depend os_map.lo
5
6Fixed parallel issue:
7libtool: link: `os_map.lo' is not a valid libtool object
8Makefile:867: recipe for target 'libdb-6.0.la' failed
9
10Upstream-Status: Pending
11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13---
14 dist/Makefile.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17Index: db-6.0.30/dist/Makefile.in
18===================================================================
19--- db-6.0.30.orig/dist/Makefile.in
20+++ db-6.0.30/dist/Makefile.in
21@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS)
22 $(LN) -s $(libdb_version) $(libdb)
23
24 # Shared C library.
25-$(libso_target): $(C_OBJS) bt_rec@o@
26+$(libso_target): $(C_OBJS) bt_rec@o@ os_map@o@
27 $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \
28 $(LIBCSO_LIBS)
29 $(RM) $(libdb)
diff --git a/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch b/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch
deleted file mode 100644
index 8680408347..0000000000
--- a/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From c640ff9340f358a00835816d0fea03d27a7be978 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 31 Mar 2015 00:56:44 -0700
4Subject: [PATCH] Makefile: let libso_target depend on bt_rec
5
6Fixed parallel issue:
7libtool: link: `bt_rec.lo' is not a valid libtool object
8Makefile:867: recipe for target 'libdb-6.0.la' failed
9make: *** [libdb-6.0.la] Error 1
10
11Upstream-Status: Pending
12
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14---
15 Makefile.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18Index: db-6.0.30/dist/Makefile.in
19===================================================================
20--- db-6.0.30.orig/dist/Makefile.in
21+++ db-6.0.30/dist/Makefile.in
22@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS)
23 $(LN) -s $(libdb_version) $(libdb)
24
25 # Shared C library.
26-$(libso_target): $(C_OBJS)
27+$(libso_target): $(C_OBJS) bt_rec@o@
28 $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \
29 $(LIBCSO_LIBS)
30 $(RM) $(libdb)
diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb
index 1b25fd4685..b7232fc894 100644
--- a/meta/recipes-support/db/db_5.3.28.bb
+++ b/meta/recipes-support/db/db_5.3.28.bb
@@ -16,6 +16,7 @@ VIRTUAL_NAME ?= "virtual/db"
16RCONFLICTS_${PN} = "db3" 16RCONFLICTS_${PN} = "db3"
17 17
18PR = "r1" 18PR = "r1"
19PE = "1"
19 20
20SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" 21SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
21SRC_URI += "file://arm-thumb-mutex_db5.patch \ 22SRC_URI += "file://arm-thumb-mutex_db5.patch \
diff --git a/meta/recipes-support/db/db_6.0.35.bb b/meta/recipes-support/db/db_6.0.35.bb
deleted file mode 100644
index b1bec0e487..0000000000
--- a/meta/recipes-support/db/db_6.0.35.bb
+++ /dev/null
@@ -1,111 +0,0 @@
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/technetwork/database/database-technologies/berkeleydb/overview/index.html"
14LICENSE = "AGPL-3.0"
15VIRTUAL_NAME ?= "virtual/db"
16RCONFLICTS_${PN} = "db3"
17
18PR = "r1"
19
20# Note, when upgraded to 6.1.x, a patch in RPM will need to be removed to activate db 6.1 support.
21SRC_URI = "http://distfiles.gentoo.org/distfiles/db-${PV}.tar.gz \
22 file://arm-thumb-mutex_db5.patch \
23 file://fix-parallel-build.patch \
24 file://Makefile-let-libso_target-depend-on-bt_rec.patch \
25 file://Makefile-let-libdb-6.0.la-depend-os_map.l.patch \
26 "
27
28SRC_URI[md5sum] = "c65a4d3e930a116abaaf69edfc697f25"
29SRC_URI[sha256sum] = "24421affa8ae436fe427ae4f5f2d1634da83d3d55a5ad6354a98eeedb825de55"
30
31# Exclude NC versions which lack AES encryption
32UPSTREAM_CHECK_REGEX = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar"
33UPSTREAM_CHECK_URI = "http://www.oracle.com/technetwork/products/berkeleydb/downloads/index-082944.html"
34
35LIC_FILES_CHKSUM = "file://LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490"
36
37# Put virtual/db in any appropriate provider of a
38# relational database, use it as a dependency in
39# place of a specific db and use:
40#
41# PREFERRED_PROVIDER_virtual/db
42#
43# to select the correct db in the build (distro) .conf
44PROVIDES += "${VIRTUAL_NAME}"
45
46inherit autotools
47
48# The executables go in a separate package - typically there
49# is no need to install these unless doing real database
50# management on the system.
51inherit lib_package
52
53PACKAGES =+ "${PN}-cxx"
54FILES_${PN}-cxx = "${libdir}/*cxx*so"
55
56# The dev package has the .so link (as in db3) and the .a's -
57# it is therefore incompatible (cannot be installed at the
58# same time) as the db3 package
59# sort out the .so since they do version prior to the .so
60SOLIBS = "-6*.so"
61FILES_SOLIBSDEV = "${libdir}/libdb.so ${libdir}/libdb_cxx.so"
62
63#configuration - set in local.conf to override
64# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix)
65DB6_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql"
66
67EXTRA_OECONF = "${DB6_CONFIG} --enable-shared --enable-cxx --with-sysroot"
68
69# Cancel the site stuff - it's set for db3 and destroys the configure.
70CONFIG_SITE = ""
71
72AUTOTOOLS_SCRIPT_PATH = "${S}/dist"
73
74do_configure() {
75 cd ${B}
76 gnu-configize --force ${AUTOTOOLS_SCRIPT_PATH}
77 oe_runconf
78}
79
80EXTRA_OEMAKE_append_class-target = " LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool"
81EXTRA_OEMAKE += "STRIP=true docdir=${docdir}/db/"
82
83do_compile_prepend() {
84 # Stop libtool adding RPATHs
85 sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' ${B}/libtool
86}
87
88do_install_append() {
89 mkdir -p ${D}/${includedir}/db60
90 mv ${D}/${includedir}/db.h ${D}/${includedir}/db60/.
91 mv ${D}/${includedir}/db_cxx.h ${D}/${includedir}/db60/.
92 ln -s db60/db.h ${D}/${includedir}/db.h
93 ln -s db60/db_cxx.h ${D}/${includedir}/db_cxx.h
94
95 # Prune the documentation to remove large (PDF) or pointless (Java) files.
96 find ${D}${docdir} -name *.pdf -delete
97 rm -rf ${D}${docdir}/db/java
98 rm -rf ${D}${docdir}/db/csharp
99
100 # The makefiles use cp -p, so we need to chmod until that is fixed.
101 chown -R root:root ${D}
102}
103
104# libdb isn't versioned in the typical manner (libdb-6.0.so is the full library
105# name) so skip these checks.
106INSANE_SKIP_${PN} = "dev-so"
107INSANE_SKIP_${PN}-cxx = "dev-so"
108
109BBCLASSEXTEND = "native nativesdk"
110
111RECIPE_NO_UPDATE_REASON = "latest db does not work with RPM-5.x due to changes in locking semantics"