summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-10-31 19:59:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-05 22:04:27 +0000
commite82320a480984f37a0fc570b6e4ff1c00074ee49 (patch)
tree716c58d120a7e86b5a093dc2955215a480d75853 /meta/recipes-support
parent57498cede4696526c121e0112b5dea3e6e8365ac (diff)
downloadpoky-e82320a480984f37a0fc570b6e4ff1c00074ee49.tar.gz
db: Fix build with high PARALLEL_MAKE
* sometimes it fails with: libtool: link: `util_log.lo' is not a valid libtool object make: *** [db_replicate] Error 1 (From OE-Core rev: 0a1efeb6260a565b6ce3abd523eabb15384570d1) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/db/db/fix-parallel-build.patch19
-rw-r--r--meta/recipes-support/db/db_5.3.21.bb3
2 files changed, 21 insertions, 1 deletions
diff --git a/meta/recipes-support/db/db/fix-parallel-build.patch b/meta/recipes-support/db/db/fix-parallel-build.patch
new file mode 100644
index 0000000000..2c7f1e186b
--- /dev/null
+++ b/meta/recipes-support/db/db/fix-parallel-build.patch
@@ -0,0 +1,19 @@
1With higher paralelism it sometimes fails with:
2libtool: link: `util_log.lo' is not a valid libtool object
3make: *** [db_replicate] Error 1
4
5Upstream-Status: Pending
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8
9--- dist.orig/Makefile.in 2012-05-11 19:57:48.000000000 +0200
10+++ dist/Makefile.in 2013-10-31 18:17:11.875532522 +0100
11@@ -1034,7 +1034,7 @@
12 db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
13 $(POSTLINK) $@
14
15-db_replicate: db_replicate@o@ util_sig@o@ $(DEF_LIB)
16+db_replicate: db_replicate@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
17 $(CCLINK) -o $@ $(LDFLAGS) \
18 db_replicate@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
19 $(POSTLINK) $@
diff --git a/meta/recipes-support/db/db_5.3.21.bb b/meta/recipes-support/db/db_5.3.21.bb
index 2265a9c20b..328f9db885 100644
--- a/meta/recipes-support/db/db_5.3.21.bb
+++ b/meta/recipes-support/db/db_5.3.21.bb
@@ -16,7 +16,8 @@ VIRTUAL_NAME ?= "virtual/db"
16RCONFLICTS_${PN} = "db3" 16RCONFLICTS_${PN} = "db3"
17 17
18SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" 18SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
19SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.." 19SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \
20 file://fix-parallel-build.patch"
20 21
21SRC_URI[md5sum] = "3fda0b004acdaa6fa350bfc41a3b95ca" 22SRC_URI[md5sum] = "3fda0b004acdaa6fa350bfc41a3b95ca"
22SRC_URI[sha256sum] = "ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8" 23SRC_URI[sha256sum] = "ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8"