diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2013-10-31 19:59:54 +0100 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-12-03 16:49:24 +0000 |
| commit | 43003ea2094e0cdc779030b3c35fa79e6d967895 (patch) | |
| tree | 0ebd679234037c4905ab6adbbbdb69792a6f23a3 | |
| parent | 6dbad65ed81a8ff80a965351dd9f229be51ca477 (diff) | |
| download | openembedded-core-43003ea2094e0cdc779030b3c35fa79e6d967895.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 master 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>
| -rw-r--r-- | meta/recipes-support/db/db/fix-parallel-build.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-support/db/db_5.3.21.bb | 3 |
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 23d6c4e369..34bdd8a1e3 100644 --- a/meta/recipes-support/db/db_5.3.21.bb +++ b/meta/recipes-support/db/db_5.3.21.bb @@ -17,7 +17,8 @@ RCONFLICTS_${PN} = "db3" PR = "r0" 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" |