Unverified Commit 7ea0c16d authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #283910 from mfrw/mfrw/most-5.2.0

most: 5.1.0 -> 5.2.0
parents 260eaeca 72dc2e66
Loading
Loading
Loading
Loading
+2 −7
Original line number Diff line number Diff line
@@ -2,18 +2,13 @@

stdenv.mkDerivation rec {
  pname = "most";
  version = "5.1.0";
  version = "5.2.0";

  src = fetchurl {
    url = "https://www.jedsoft.org/releases/${pname}/${pname}-${version}.tar.gz";
    sha256 = "008537ns659pw2aag15imwjrxj73j26aqq90h285is6kz8gmv06v";
    hash = "sha256-lFWuuPgm+oOFyFDcIr8PIs+QabPDQj+6S/LG9iJtmQM=";
  };

  patches = [
    # Upstream patch to fix parallel build failure
    ./parallel-make.patch
  ];

  outputs = [ "out" "doc" ];

  makeFlags = [
+0 −18
Original line number Diff line number Diff line
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)
 #