From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F059158090 for ; Mon, 9 May 2022 23:08:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51FEBE085A; Mon, 9 May 2022 23:08:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A13BE085A for ; Mon, 9 May 2022 23:08:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C64C1341510 for ; Mon, 9 May 2022 23:08:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FED23B2 for ; Mon, 9 May 2022 23:08:21 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1652137684.28228540cd1b8ae8326647437969fb716e9fe53e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/, net-nds/openldap/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nds/openldap/files/openldap-2.6.1-parallel-build.patch net-nds/openldap/openldap-2.6.1-r1.ebuild X-VCS-Directories: net-nds/openldap/files/ net-nds/openldap/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 28228540cd1b8ae8326647437969fb716e9fe53e X-VCS-Branch: master Date: Mon, 9 May 2022 23:08:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2b54a095-37b7-4362-aa65-2412433e49c2 X-Archives-Hash: 36e003975a72a8785aeae78fd2732616 commit: 28228540cd1b8ae8326647437969fb716e9fe53e Author: Sam James gentoo org> AuthorDate: Mon May 9 23:08:04 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 9 23:08:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28228540 net-nds/openldap: fix parallel build failure Closes: https://bugs.gentoo.org/836557 Signed-off-by: Sam James gentoo.org> .../files/openldap-2.6.1-parallel-build.patch | 46 ++++++++++++++++++++++ net-nds/openldap/openldap-2.6.1-r1.ebuild | 1 + 2 files changed, 47 insertions(+) diff --git a/net-nds/openldap/files/openldap-2.6.1-parallel-build.patch b/net-nds/openldap/files/openldap-2.6.1-parallel-build.patch new file mode 100644 index 000000000000..757a33c602b2 --- /dev/null +++ b/net-nds/openldap/files/openldap-2.6.1-parallel-build.patch @@ -0,0 +1,46 @@ +https://github.com/openldap/openldap/commit/d7c0417bcfba5400c0be2ce83eaf43ec97c97edd.patch +https://github.com/openldap/openldap/commit/d75de4d6e98e9501ada2b6a1d527669bd7eb2fa3.patch +https://bugs.gentoo.org/836557 + +From: Yi Zhao +Date: Thu, 2 Dec 2021 11:38:15 +0800 +Subject: [PATCH] ITS#9840 - 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 + +Signed-off-by: Yi Zhao +--- 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) + +From: Yi Zhao +Date: Mon, 10 Jan 2022 10:13:51 +0800 +Subject: [PATCH] ITS#9840 - 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 + +Signed-off-by: Yi Zhao +--- 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 diff --git a/net-nds/openldap/openldap-2.6.1-r1.ebuild b/net-nds/openldap/openldap-2.6.1-r1.ebuild index f90979e12030..6c594f6880be 100644 --- a/net-nds/openldap/openldap-2.6.1-r1.ebuild +++ b/net-nds/openldap/openldap-2.6.1-r1.ebuild @@ -141,6 +141,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch "${FILESDIR}"/${PN}-2.6.1-make-flags.patch "${FILESDIR}"/${PN}-2.6.1-fix-bashism-configure.patch + "${FILESDIR}"/${PN}-2.6.1-parallel-build.patch ) openldap_filecount() {