diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2021-12-02 18:11:36 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2021-12-02 07:52:17 -0800 |
| commit | d9a6d3ea3c25fe00ebbf2a6870ded6aeb129ec8e (patch) | |
| tree | 6194f297d21105323d6cd3fe6136fbebbda8ecfd | |
| parent | a12cd7869b4f6ff11e6b67dd3f243298941641e7 (diff) | |
| download | meta-openembedded-contrib-d9a6d3ea3c25fe00ebbf2a6870ded6aeb129ec8e.tar.gz | |
openldap: fix parallel build failure
Add slapd-common.o as dependency for ldif-filter to fix the parallel
build failure:
ld: cannot find slapd-common.o: No such file or directory
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/openldap/openldap/0001-ldif-filter-fix-parallel-build-failure.patch | 32 | ||||
| -rw-r--r-- | meta-oe/recipes-support/openldap/openldap_2.5.8.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap/0001-ldif-filter-fix-parallel-build-failure.patch b/meta-oe/recipes-support/openldap/openldap/0001-ldif-filter-fix-parallel-build-failure.patch new file mode 100644 index 0000000000..b42bd9764f --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap/0001-ldif-filter-fix-parallel-build-failure.patch @@ -0,0 +1,32 @@ +From 9e4ccd1e78ceac8de1ab66ee62ee216f1fbd4956 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Thu, 2 Dec 2021 11:38:15 +0800 +Subject: [PATCH] ldif-filter: fix parallel build failure + +Add slapd-common.o as dependency for ldif-filter to fix the parallel +build failure: + ld: cannot find slapd-common.o: No such file or directory + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + tests/progs/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in +index 13f1e8be2..e4f4ccf98 100644 +--- a/tests/progs/Makefile.in ++++ b/tests/progs/Makefile.in +@@ -56,7 +56,7 @@ slapd-modify: slapd-modify.o $(OBJS) $(XLIBS) + slapd-bind: slapd-bind.o $(OBJS) $(XLIBS) + $(LTLINK) -o $@ slapd-bind.o $(OBJS) $(LIBS) + +-ldif-filter: ldif-filter.o $(XLIBS) ++ldif-filter: ldif-filter.o $(OBJS) $(XLIBS) + $(LTLINK) -o $@ ldif-filter.o $(OBJS) $(LIBS) + + slapd-mtread: slapd-mtread.o $(OBJS) $(XLIBS) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.8.bb b/meta-oe/recipes-support/openldap/openldap_2.5.8.bb index 07d9fe6cf5..17e6f72dcf 100644 --- a/meta-oe/recipes-support/openldap/openldap_2.5.8.bb +++ b/meta-oe/recipes-support/openldap/openldap_2.5.8.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$ file://initscript \ file://slapd.service \ file://remove-user-host-pwd-from-version.patch \ + file://0001-ldif-filter-fix-parallel-build-failure.patch \ " SRC_URI[md5sum] = "86e3ffce4adfc57cbb76ac0ff48b2614" |