mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

openldap: ignore the mkdir errors in Makefile

Browse Source 
Ignore the mkdir errors to fix the parallel build failure:

../../build/shtool mkdir -p TOPDIR/tmp-glibc/work/cortexa15t2hf-neon-wrs-linux-gnueabi/openldap/2.5.9-r0/image/usr/lib
mkdir: cannot create directory 'TOPDIR/tmp-glibc/work/cortexa15t2hf-neon-wrs-linux-gnueabi/openldap/2.5.9-r0/image/usr/lib': File exists
make[1]: *** [Makefile:288: install-local] Error 1

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
2022-01-14 09:39:08 +08:00
committed by Khem Raj
parent 57d127e81e
commit 5dd27b4a9f
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/openldap/openldap/0001-libraries-Makefile.in-ignore-the-mkdir-errors.patch
+33
View File
@@ -0,0 +1,33 @@
From 690f69791eb6cd0d7e94b4d73219ee864de27f62 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Mon, 10 Jan 2022 10:13:51 +0800
Subject: [PATCH] libraries/Makefile.in: ignore the mkdir errors
Ignore the mkdir errors to fix the parallel build failure:
../../build/shtool mkdir -p TOPDIR/tmp-glibc/work/cortexa15t2hf-neon-wrs-linux-gnueabi/openldap/2.5.9-r0/image/usr/lib
mkdir: cannot create directory 'TOPDIR/tmp-glibc/work/cortexa15t2hf-neon-wrs-linux-gnueabi/openldap/2.5.9-r0/image/usr/lib': File exists
Upstream-Status: Pending
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
libraries/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libraries/Makefile.in b/libraries/Makefile.in
index d9cb2ff..c6b251f 100644
--- a/libraries/Makefile.in
+++ b/libraries/Makefile.in
@@ -24,7 +24,7 @@ PKGCONFIG_DIR=$(DESTDIR)$(libdir)/pkgconfig
PKGCONFIG_SRCDIRS=liblber libldap
install-local:
- @$(MKDIR) $(PKGCONFIG_DIR)
+ @-$(MKDIR) $(PKGCONFIG_DIR)
@for i in $(PKGCONFIG_SRCDIRS); do \
$(INSTALL_DATA) $$i/*.pc $(PKGCONFIG_DIR); \
done
--
2.17.1
meta-oe/recipes-support/openldap/openldap_2.5.9.bb
+1
View File
@@ -22,6 +22,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
file://remove-user-host-pwd-from-version.patch \
file://0001-ldif-filter-fix-parallel-build-failure.patch \
file://0001-build-top.mk-unset-STRIP_OPTS.patch \
file://0001-libraries-Makefile.in-ignore-the-mkdir-errors.patch \
"
SRC_URI[md5sum] = "237fc2d881c27f8dd5d9f396e2865c11"