diff options
author | Ross Burton <ross.burton@intel.com> | 2016-02-23 14:05:35 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-10 14:12:17 +0100 |
commit | 3a6f0b66a5550b392317c6ad77a4e8298906d218 (patch) | |
tree | 2b288a9061f6dd424c3365b111d0401ee9ad2df2 /meta/recipes-support/db/db_5.3.28.bb | |
parent | b58c5dc787227aaf069f812450ff366608097099 (diff) | |
download | openembedded-core-contrib-3a6f0b66a5550b392317c6ad77a4e8298906d218.tar.gz |
db: use S/B more idiomatically
Instead of setting S to a directory inside the tarball and B to another
directory inside the tarball, use the default value of S and set
AUTOTOOLS_SCRIPT_PATH to the right path to find configure. Update the patches
so they still apply, and clean up the recipe slightly.
Because something is not quite right regarding quilt and patching, add a PR bump
to the recipes to ensure that a clean work directory is used: for some reason
rebuilds will rarely fail to patch correctly.
(From OE-Core rev: dcbef72b8344c22617d65ea1e9f0fa7ad9a742bd)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/db/db_5.3.28.bb')
-rw-r--r-- | meta/recipes-support/db/db_5.3.28.bb | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb index c724f049f7..6b0e76b1a3 100644 --- a/meta/recipes-support/db/db_5.3.28.bb +++ b/meta/recipes-support/db/db_5.3.28.bb @@ -15,15 +15,17 @@ LICENSE = "Sleepycat" VIRTUAL_NAME ?= "virtual/db" RCONFLICTS_${PN} = "db3" +PR = "r1" + SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" -SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \ +SRC_URI += "file://arm-thumb-mutex_db5.patch \ file://fix-parallel-build.patch \ " SRC_URI[md5sum] = "b99454564d5b4479750567031d66fe24" SRC_URI[sha256sum] = "e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=ed1158e31437f4f87cdd4ab2b8613955" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ed1158e31437f4f87cdd4ab2b8613955" inherit autotools @@ -36,14 +38,6 @@ inherit autotools # to select the correct db in the build (distro) .conf PROVIDES += "${VIRTUAL_NAME}" -# bitbake isn't quite clever enough to deal with sleepycat, -# the distribution sits in the expected directory, but all -# the builds must occur from a sub-directory. The following -# persuades bitbake to go to the right place -S = "${WORKDIR}/db-${PV}/dist" -B = "${WORKDIR}/db-${PV}/build_unix" -SPDX_S = "${WORKDIR}/db-${PV}" - # The executables go in a separate package - typically there # is no need to install these unless doing real database # management on the system. @@ -75,21 +69,22 @@ ARM_MUTEX = "--with-mutex=ARM/gcc-assembly" MUTEX = "" MUTEX_arm = "${ARM_MUTEX}" MUTEX_armeb = "${ARM_MUTEX}" -EXTRA_OECONF += "${MUTEX}" -EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" +EXTRA_OECONF += "${MUTEX} STRIP=true" + +AUTOTOOLS_SCRIPT_PATH = "${S}/dist" # Cancel the site stuff - it's set for db3 and destroys the # configure. CONFIG_SITE = "" do_configure() { - gnu-configize --force ${S} - export STRIP="true" + cd ${B} + gnu-configize --force ${AUTOTOOLS_SCRIPT_PATH} oe_runconf } do_compile_prepend() { - sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' \ - ${B}/libtool + # Stop libtool adding RPATHs + sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' ${B}/libtool } do_install_append() { @@ -114,4 +109,3 @@ INSANE_SKIP_${PN} = "dev-so" INSANE_SKIP_${PN}-cxx = "dev-so" BBCLASSEXTEND = "native nativesdk" - |