Archives
Archives
| From: | "Mike Frysinger (vapier)" <vapier@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in sys-apps/groff/files: groff-1.20.1-pdfmark-parallel.patch |
| Date: | Wed, 21 Dec 2011 19:33:35 |
| Message-Id: | 20111221193324.784352004C@flycatcher.gentoo.org |
| 1 | vapier 11/12/21 19:33:24 |
| 2 | |
| 3 | Added: groff-1.20.1-pdfmark-parallel.patch |
| 4 | Log: |
| 5 | Fix parallel build failure in pdfmark subdir. |
| 6 | |
| 7 | (Portage version: 2.2.0_alpha81/cvs/Linux x86_64) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 sys-apps/groff/files/groff-1.20.1-pdfmark-parallel.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/groff/files/groff-1.20.1-pdfmark-parallel.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/groff/files/groff-1.20.1-pdfmark-parallel.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: groff-1.20.1-pdfmark-parallel.patch |
| 16 | =================================================================== |
| 17 | http://crosbug.com/24481 |
| 18 | https://savannah.gnu.org/bugs/index.php?35146 |
| 19 | |
| 20 | From 324a699b3903bd7d9d248bc229ab8518fc47cbed Mon Sep 17 00:00:00 2001 |
| 21 | From: Mike Frysinger <vapier@g.o> |
| 22 | Date: Wed, 21 Dec 2011 14:15:50 -0500 |
| 23 | Subject: [PATCH] pdfmark: fix parallel build race failure |
| 24 | |
| 25 | Sometimes building in parallel will fail in the pdfmark directory: |
| 26 | make[2]: Entering directory '.../contrib/pdfmark' |
| 27 | rm -f pdfroff |
| 28 | rm -f pdfmark.pdf |
| 29 | sed -f ... ./pdfroff.sh >pdfroff |
| 30 | ...; ./pdfroff ... pdfmark.ms >pdfmark.pdf |
| 31 | /bin/sh: ./pdfroff: Permission denied |
| 32 | chmod +x pdfroff |
| 33 | make[2]: *** [pdfmark.pdf] Error 126 |
| 34 | |
| 35 | This is because the generated pdf files use the local generated pdfroff |
| 36 | helper script, but they don't depend directly upon it, so make tries to |
| 37 | create the two in parallel and randomly falls over. |
| 38 | |
| 39 | Have all the .pdf files explicitly depend on the pdfroff helper script. |
| 40 | |
| 41 | Signed-off-by: Mike Frysinger <vapier@g.o> |
| 42 | --- |
| 43 | contrib/pdfmark/Makefile.sub | 3 +++ |
| 44 | 1 files changed, 3 insertions(+), 0 deletions(-) |
| 45 | |
| 46 | diff --git a/contrib/pdfmark/Makefile.sub b/contrib/pdfmark/Makefile.sub |
| 47 | index 9eb2763..36c9e0f 100644 |
| 48 | --- a/contrib/pdfmark/Makefile.sub |
| 49 | +++ b/contrib/pdfmark/Makefile.sub |
| 50 | @@ -66,6 +66,9 @@ PDFROFF=\ |
| 51 | |
| 52 | all: pdfroff $(make_pdfdoc) |
| 53 | |
| 54 | +# The pdf files use the local script to generate. |
| 55 | +$(PDFDOCFILES): pdfroff |
| 56 | + |
| 57 | pdfdoc: gnu.eps $(PDFDOCFILES) |
| 58 | |
| 59 | gnu.eps: |
| 60 | -- |
| 61 | 1.7.6.1 |