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 | |
| 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')
| -rw-r--r-- | meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch | 4 | ||||
| -rw-r--r-- | meta/recipes-support/db/db/fix-parallel-build.patch | 4 |
2 files changed, 4 insertions, 4 deletions
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 index 329bff5d3b..9ec117ae4e 100644 --- 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 @@ -17,8 +17,8 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> diff --git a/Makefile.in b/Makefile.in index e451f70..0a42375 100644 ---- a/Makefile.in -+++ b/Makefile.in +--- db/dist/Makefile.in ++++ db/dist/Makefile.in @@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS) $(LN) -s $(libdb_version) $(libdb) diff --git a/meta/recipes-support/db/db/fix-parallel-build.patch b/meta/recipes-support/db/db/fix-parallel-build.patch index 2c7f1e186b..88bc6b35e5 100644 --- a/meta/recipes-support/db/db/fix-parallel-build.patch +++ b/meta/recipes-support/db/db/fix-parallel-build.patch @@ -6,8 +6,8 @@ Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- dist.orig/Makefile.in 2012-05-11 19:57:48.000000000 +0200 -+++ dist/Makefile.in 2013-10-31 18:17:11.875532522 +0100 +--- db/dist.orig/Makefile.in 2012-05-11 19:57:48.000000000 +0200 ++++ db/dist/Makefile.in 2013-10-31 18:17:11.875532522 +0100 @@ -1034,7 +1034,7 @@ db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS) $(POSTLINK) $@ |