summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/db
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-10-31 19:59:54 +0100
committerSaul Wold <sgw@linux.intel.com>2013-11-04 10:01:16 -0800
commit0a1efeb6260a565b6ce3abd523eabb15384570d1 (patch)
tree14980a6898c78c871b7b51b04d1be6af99ff937a /meta/recipes-support/db
parent1d2d37d579492b63d20ff8aa890a43b9a1576cf0 (diff)
downloadopenembedded-core-0a1efeb6260a565b6ce3abd523eabb15384570d1.tar.gz
openembedded-core-0a1efeb6260a565b6ce3abd523eabb15384570d1.tar.bz2
openembedded-core-0a1efeb6260a565b6ce3abd523eabb15384570d1.zip
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 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/db')
-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 @@
+With higher paralelism it sometimes fails with:
+libtool: link: `util_log.lo' is not a valid libtool object
+make: *** [db_replicate] Error 1
+
+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
+@@ -1034,7 +1034,7 @@
+ db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
+ $(POSTLINK) $@
+
+-db_replicate: db_replicate@o@ util_sig@o@ $(DEF_LIB)
++db_replicate: db_replicate@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
+ $(CCLINK) -o $@ $(LDFLAGS) \
+ db_replicate@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
+ $(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"
RCONFLICTS_${PN} = "db3"
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;patchdir=.. \
+ file://fix-parallel-build.patch"
SRC_URI[md5sum] = "3fda0b004acdaa6fa350bfc41a3b95ca"
SRC_URI[sha256sum] = "ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8"