From 8349bbd03f37d8f9f7507e67dace47acb2b84bde Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 22 Oct 2017 22:16:19 -0700 Subject: dovecot: Fix parallel build Signed-off-by: Khem Raj Signed-off-by: Armin Kuster Signed-off-by: Joe MacDonald (cherry picked from commit ff720f34e47638dd86f9671ab8073f27094d819f) Signed-off-by: Armin Kuster --- .../dovecot/0001-doveadm-Fix-parallel-build.patch | 38 ++++++++++++++++++++++ .../recipes-support/dovecot/dovecot_2.2.29.bb | 4 ++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch (limited to 'meta-networking') diff --git a/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch b/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch new file mode 100644 index 0000000000..65ae9bf910 --- /dev/null +++ b/meta-networking/recipes-support/dovecot/dovecot/0001-doveadm-Fix-parallel-build.patch @@ -0,0 +1,38 @@ +From be9b3809b86fe593dbb16f0b981b3d315a27b799 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 22 Oct 2017 22:10:41 -0700 +Subject: [PATCH] doveadm: Fix parallel build + +Sometimes dovetail build fails with errors like + +doveadm-util.o: file not recognized: File truncated +collect2: error: ld returned 1 exit status +make[4]: *** [Makefile:812: test-doveadm-util] Error 1 + +This is partial backport from + +https://github.com/dovecot/core/commit/b200bc3875fa06d42c8619865cc306c3297fcacc + +Signed-off-by: Khem Raj +--- + src/doveadm/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/doveadm/Makefile.am b/src/doveadm/Makefile.am +index c644646..6ae9144 100644 +--- a/src/doveadm/Makefile.am ++++ b/src/doveadm/Makefile.am +@@ -180,8 +180,8 @@ test_libs = \ + ../lib/liblib.la + test_deps = $(noinst_LTLIBRARIES) $(test_libs) + +-test_doveadm_util_SOURCES = test-doveadm-util.c +-test_doveadm_util_LDADD = doveadm-util.o $(test_libs) $(MODULE_LIBS) ++test_doveadm_util_SOURCES = doveadm-util.c test-doveadm-util.c ++test_doveadm_util_LDADD = $(test_libs) $(MODULE_LIBS) + test_doveadm_util_DEPENDENCIES = $(test_deps) + + check: check-am check-test +-- +2.14.2 + diff --git a/meta-networking/recipes-support/dovecot/dovecot_2.2.29.bb b/meta-networking/recipes-support/dovecot/dovecot_2.2.29.bb index d834bef71d..1663408736 100644 --- a/meta-networking/recipes-support/dovecot/dovecot_2.2.29.bb +++ b/meta-networking/recipes-support/dovecot/dovecot_2.2.29.bb @@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a981379bd0f1c362f8d1d21515e5b30b" SRC_URI = "http://dovecot.org/releases/2.2/dovecot-${PV}.tar.gz \ file://0001-configure.ac-convert-AC_TRY_RUN-to-AC_TRY_LINK-state.patch \ file://dovecot.service \ - file://dovecot.socket" + file://dovecot.socket \ + file://0001-doveadm-Fix-parallel-build.patch \ + " SRC_URI[md5sum] = "ff95486a5c43025a2c3f5a712e7962b9" SRC_URI[sha256sum] = "d939ea99126eb8a8c6955390b422b6e27ec0fa43a3b59b2b3218cb5ad67139a6" -- cgit 1.2.3-korg