commit: e0aba0f8c5d55bb8c9dc71787905cc1fe36e1ef4 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Nov 19 09:00:46 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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() {
