most: enable parallel building

main
Sergei Trofimovich 3 years ago
parent 5373418b44
commit 7eaf05af30
  1. 7
      pkgs/tools/misc/most/default.nix
  2. 18
      pkgs/tools/misc/most/parallel-make.patch

@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "008537ns659pw2aag15imwjrxj73j26aqq90h285is6kz8gmv06v";
};
patches = [
# Upstream patch to fix parallel build failure
./parallel-make.patch
];
outputs = [ "out" "doc" ];
makeFlags = [
@ -26,6 +31,8 @@ stdenv.mkDerivation rec {
buildInputs = [ slang ncurses ];
enableParallelBuilding = true;
meta = with lib; {
description = "A terminal pager similar to 'more' and 'less'";
longDescription = ''

@ -0,0 +1,18 @@
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)
#
Loading…
Cancel
Save