diff options
Diffstat (limited to 'meta/recipes-support/db/db_6.0.30.bb')
-rw-r--r-- | meta/recipes-support/db/db_6.0.30.bb | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/meta/recipes-support/db/db_6.0.30.bb b/meta/recipes-support/db/db_6.0.30.bb index 018dd58f67..08528206f9 100644 --- a/meta/recipes-support/db/db_6.0.30.bb +++ b/meta/recipes-support/db/db_6.0.30.bb | |||
@@ -15,13 +15,15 @@ LICENSE = "AGPL-3.0" | |||
15 | VIRTUAL_NAME ?= "virtual/db" | 15 | VIRTUAL_NAME ?= "virtual/db" |
16 | RCONFLICTS_${PN} = "db3" | 16 | RCONFLICTS_${PN} = "db3" |
17 | 17 | ||
18 | PR = "r1" | ||
19 | |||
18 | # Note, when upgraded to 6.1.x, a patch in RPM will need to be removed to activate db 6.1 support. | 20 | # Note, when upgraded to 6.1.x, a patch in RPM will need to be removed to activate db 6.1 support. |
19 | 21 | ||
20 | SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" | 22 | SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz \ |
21 | SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \ | 23 | file://arm-thumb-mutex_db5.patch \ |
22 | file://fix-parallel-build.patch \ | 24 | file://fix-parallel-build.patch \ |
23 | file://Makefile-let-libso_target-depend-on-bt_rec.patch \ | 25 | file://Makefile-let-libso_target-depend-on-bt_rec.patch \ |
24 | file://Makefile-let-libdb-6.0.la-depend-os_map.l.patch;patchdir=.. \ | 26 | file://Makefile-let-libdb-6.0.la-depend-os_map.l.patch \ |
25 | " | 27 | " |
26 | 28 | ||
27 | SRC_URI[md5sum] = "ad28eb86ad3203b5422844db179c585b" | 29 | SRC_URI[md5sum] = "ad28eb86ad3203b5422844db179c585b" |
@@ -31,9 +33,7 @@ SRC_URI[sha256sum] = "608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6 | |||
31 | UPSTREAM_CHECK_REGEX = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar" | 33 | UPSTREAM_CHECK_REGEX = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar" |
32 | UPSTREAM_CHECK_URI = "http://www.oracle.com/technetwork/products/berkeleydb/downloads/index-082944.html" | 34 | UPSTREAM_CHECK_URI = "http://www.oracle.com/technetwork/products/berkeleydb/downloads/index-082944.html" |
33 | 35 | ||
34 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490" | 36 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490" |
35 | |||
36 | inherit autotools | ||
37 | 37 | ||
38 | # Put virtual/db in any appropriate provider of a | 38 | # Put virtual/db in any appropriate provider of a |
39 | # relational database, use it as a dependency in | 39 | # relational database, use it as a dependency in |
@@ -44,13 +44,7 @@ inherit autotools | |||
44 | # to select the correct db in the build (distro) .conf | 44 | # to select the correct db in the build (distro) .conf |
45 | PROVIDES += "${VIRTUAL_NAME}" | 45 | PROVIDES += "${VIRTUAL_NAME}" |
46 | 46 | ||
47 | # bitbake isn't quite clever enough to deal with sleepycat, | 47 | inherit autotools |
48 | # the distribution sits in the expected directory, but all | ||
49 | # the builds must occur from a sub-directory. The following | ||
50 | # persuades bitbake to go to the right place | ||
51 | S = "${WORKDIR}/db-${PV}/dist" | ||
52 | B = "${WORKDIR}/db-${PV}/build_unix" | ||
53 | SPDX_S = "${WORKDIR}/db-${PV}" | ||
54 | 48 | ||
55 | # The executables go in a separate package - typically there | 49 | # The executables go in a separate package - typically there |
56 | # is no need to install these unless doing real database | 50 | # is no need to install these unless doing real database |
@@ -60,7 +54,6 @@ inherit lib_package | |||
60 | PACKAGES =+ "${PN}-cxx" | 54 | PACKAGES =+ "${PN}-cxx" |
61 | FILES_${PN}-cxx = "${libdir}/*cxx*so" | 55 | FILES_${PN}-cxx = "${libdir}/*cxx*so" |
62 | 56 | ||
63 | |||
64 | # The dev package has the .so link (as in db3) and the .a's - | 57 | # The dev package has the .so link (as in db3) and the .a's - |
65 | # it is therefore incompatible (cannot be installed at the | 58 | # it is therefore incompatible (cannot be installed at the |
66 | # same time) as the db3 package | 59 | # same time) as the db3 package |
@@ -74,6 +67,17 @@ DB6_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disabl | |||
74 | 67 | ||
75 | EXTRA_OECONF = "${DB6_CONFIG} --enable-shared --enable-cxx --with-sysroot" | 68 | EXTRA_OECONF = "${DB6_CONFIG} --enable-shared --enable-cxx --with-sysroot" |
76 | 69 | ||
70 | # Cancel the site stuff - it's set for db3 and destroys the configure. | ||
71 | CONFIG_SITE = "" | ||
72 | |||
73 | AUTOTOOLS_SCRIPT_PATH = "${S}/dist" | ||
74 | |||
75 | do_configure() { | ||
76 | cd ${B} | ||
77 | gnu-configize --force ${AUTOTOOLS_SCRIPT_PATH} | ||
78 | oe_runconf | ||
79 | } | ||
80 | |||
77 | # Override the MUTEX setting here, the POSIX library is | 81 | # Override the MUTEX setting here, the POSIX library is |
78 | # the default - "POSIX/pthreads/library". | 82 | # the default - "POSIX/pthreads/library". |
79 | # Don't ignore the nice SWP instruction on the ARM: | 83 | # Don't ignore the nice SWP instruction on the ARM: |
@@ -83,20 +87,11 @@ MUTEX = "" | |||
83 | MUTEX_arm = "${ARM_MUTEX}" | 87 | MUTEX_arm = "${ARM_MUTEX}" |
84 | MUTEX_armeb = "${ARM_MUTEX}" | 88 | MUTEX_armeb = "${ARM_MUTEX}" |
85 | EXTRA_OECONF += "${MUTEX}" | 89 | EXTRA_OECONF += "${MUTEX}" |
86 | EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" | 90 | EXTRA_OEMAKE += "STRIP=true" |
87 | |||
88 | # Cancel the site stuff - it's set for db3 and destroys the | ||
89 | # configure. | ||
90 | CONFIG_SITE = "" | ||
91 | do_configure() { | ||
92 | gnu-configize --force ${S} | ||
93 | export STRIP="true" | ||
94 | oe_runconf | ||
95 | } | ||
96 | 91 | ||
97 | do_compile_prepend() { | 92 | do_compile_prepend() { |
98 | sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' \ | 93 | # Stop libtool adding RPATHs |
99 | ${B}/libtool | 94 | sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' ${B}/libtool |
100 | } | 95 | } |
101 | 96 | ||
102 | do_install_append() { | 97 | do_install_append() { |
@@ -117,6 +112,8 @@ do_install_append() { | |||
117 | chown -R root:root ${D} | 112 | chown -R root:root ${D} |
118 | } | 113 | } |
119 | 114 | ||
115 | # libdb isn't versioned in the typical manner (libdb-6.0.so is the full library | ||
116 | # name) so skip these checks. | ||
120 | INSANE_SKIP_${PN} = "dev-so" | 117 | INSANE_SKIP_${PN} = "dev-so" |
121 | INSANE_SKIP_${PN}-cxx = "dev-so" | 118 | INSANE_SKIP_${PN}-cxx = "dev-so" |
122 | 119 | ||