diff options
-rw-r--r-- | contrib/pdfmark/ChangeLog | 24 | ||||
-rw-r--r-- | contrib/pdfmark/Makefile.sub | 5 |
2 files changed, 27 insertions, 2 deletions
diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog index b9403abd..87b1bfa2 100644 --- a/contrib/pdfmark/ChangeLog +++ b/contrib/pdfmark/ChangeLog @@ -1,3 +1,25 @@ +2011-12-26 Mike Frysinger <vapier@gentoo.org> + + Fix parallel build race failure. + + Sometimes building in parallel will fail in the pdfmark directory: + + make[2]: Entering directory '.../contrib/pdfmark' + rm -f pdfroff + rm -f pdfmark.pdf + sed -f ... ./pdfroff.sh >pdfroff + ...; ./pdfroff ... pdfmark.ms >pdfmark.pdf + /bin/sh: ./pdfroff: Permission denied + chmod +x pdfroff + make[2]: *** [pdfmark.pdf] Error 126 + + This is because the generated pdf files use the local generated + pdfroff helper script, but they don't depend directly upon it, so + make tries to create the two in parallel and randomly falls over. + + * Makefile.sub: Have all the .pdf files explicitly depend on the + `pdfroff' helper script. + 2010-12-23 Keith Marshall <keith.d.marshall@ntlworld.com> Update copyright notices; pdfmark.tmac bug-fix. @@ -314,7 +336,7 @@ First import of pdfmark files. -Copyright 2004, 2005, 2006, 2007, 2008 +Copyright 2004-2011 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/contrib/pdfmark/Makefile.sub b/contrib/pdfmark/Makefile.sub index 9eb27631..77e77a7f 100644 --- a/contrib/pdfmark/Makefile.sub +++ b/contrib/pdfmark/Makefile.sub @@ -1,4 +1,4 @@ -# Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2009, 2011 Free Software Foundation, Inc. # Written by Keith Marshall (keith.d.marshall@ntlworld.com) # # This file is part of groff. @@ -66,6 +66,9 @@ PDFROFF=\ all: pdfroff $(make_pdfdoc) +# The pdf files use the local script to generate. +$(PDFDOCFILES): pdfroff + pdfdoc: gnu.eps $(PDFDOCFILES) gnu.eps: |