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 4A3A7158086 for ; Fri, 19 Nov 2021 09:06:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C209E0817; Fri, 19 Nov 2021 09:06:14 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E365FE0817 for ; Fri, 19 Nov 2021 09:06:13 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1040342C61 for ; Fri, 19 Nov 2021 09:06:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94FFD1D4 for ; Fri, 19 Nov 2021 09:06:11 +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: <1637312763.e0aba0f8c5d55bb8c9dc71787905cc1fe36e1ef4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/most/files/, sys-apps/most/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/most/files/most-5.1.0-fix-parallel-build.patch sys-apps/most/most-5.1.0.ebuild X-VCS-Directories: sys-apps/most/files/ sys-apps/most/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e0aba0f8c5d55bb8c9dc71787905cc1fe36e1ef4 X-VCS-Branch: master Date: Fri, 19 Nov 2021 09:06:11 +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: 9c44d746-0820-4034-921d-a585fcee5f40 X-Archives-Hash: 56e5952ea0b71ef42a138e6c324bb743 commit: e0aba0f8c5d55bb8c9dc71787905cc1fe36e1ef4 Author: Sam James gentoo org> AuthorDate: Fri Nov 19 09:00:46 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Nov 19 09:06:03 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0aba0f8 sys-apps/most: backport parallel build patch Closes: https://bugs.gentoo.org/795117 Signed-off-by: Sam James gentoo.org> .../most/files/most-5.1.0-fix-parallel-build.patch | 21 +++++++++++++++++++++ sys-apps/most/most-5.1.0.ebuild | 1 + 2 files changed, 22 insertions(+) diff --git a/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch b/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch new file mode 100644 index 000000000000..0b5e5b2da3f6 --- /dev/null +++ b/sys-apps/most/files/most-5.1.0-fix-parallel-build.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/795117 + +Grabbed from NixOS (slyfox submitted this upstream): + +Upstream commit c9cfad50a ("src/Makefile.in: Avoid a race condition +when performing a parallel build") +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -54,6 +54,12 @@ COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) -DMOST_SYSTEM_INITFILE='"$(SYS_INITFILE)"' + all: $(EXEC) + $(EXEC): $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/$(EXEC) + @echo $(EXEC) created in $(OBJDIR) ++ ++# C source files include autogenrated "config.h". Make sure ++# it's available before the compilation. Pessimistically assume ++# any source file can depend on "config.h". ++$(OBJS) $(OBJDIR)/chkslang.o: $(CONFIG_H) ++ + $(OBJDIR)/$(EXEC): $(OBJS) + cd $(OBJDIR); $(CC) $(OFILES) -o $(EXEC) $(LDFLAGS) $(EXECLIBS) + # diff --git a/sys-apps/most/most-5.1.0.ebuild b/sys-apps/most/most-5.1.0.ebuild index 18b707ef38fb..b09ff495ab76 100644 --- a/sys-apps/most/most-5.1.0.ebuild +++ b/sys-apps/most/most-5.1.0.ebuild @@ -18,6 +18,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-5.0.0a-donot-hardcode-path.patch + "${FILESDIR}"/${P}-fix-parallel-build.patch ) src_prepare() {