| 1 |
vapier 13/12/07 05:55:00 |
| 2 |
|
| 3 |
Added: groff-1.22.2-parallel-mom.patch |
| 4 |
Log: |
| 5 |
Fix parallel build with gropdf #487276 by Jimmy C. Chau. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-apps/groff/files/groff-1.22.2-parallel-mom.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: groff-1.22.2-parallel-mom.patch |
| 16 |
=================================================================== |
| 17 |
From 9f3af719383ab525c86ee0f514e268ef8494330a Mon Sep 17 00:00:00 2001 |
| 18 |
From: Mike Frysinger <vapier@g.o> |
| 19 |
Date: Fri, 6 Dec 2013 20:40:10 -0500 |
| 20 |
Subject: [PATCH] fix parallel build w/gropdf and mom examples |
| 21 |
|
| 22 |
The contrib/mom/examples/ directory uses the helper script from |
| 23 |
src/devices/gropdf/. Currently though, parallel builds might fail |
| 24 |
like so: |
| 25 |
|
| 26 |
... |
| 27 |
make[2]: Entering directory `.../groff-1.22.2/contrib/mom' |
| 28 |
GROFF_COMMAND_PREFIX= GROFF_BIN_PATH="`echo .../groff-1.22.2/src/roff/groff .../groff-1.22.2/src/roff/troff .../groff-1.22.2/src/devices/grops .../groff-1.22.2/src/devices/gropdf | sed -e 's| *|:|g'`" PDFMOM_BIN_PATH=".../groff-1.22.2/src/devices/gropdf" .../groff-1.22.2/src/devices/gropdf/pdfmom -F.../groff-1.22.2/font -F.../groff-1.22.2/font -M.../groff-1.22.2/tmac -M.../groff-1.22.2/tmac -M. examples/letter.mom >examples/letter.pdf |
| 29 |
GROFF_COMMAND_PREFIX= GROFF_BIN_PATH="`echo .../groff-1.22.2/src/roff/groff .../groff-1.22.2/src/roff/troff .../groff-1.22.2/src/devices/grops .../groff-1.22.2/src/devices/gropdf | sed -e 's| *|:|g'`" PDFMOM_BIN_PATH=".../groff-1.22.2/src/devices/gropdf" .../groff-1.22.2/src/devices/gropdf/pdfmom -F.../groff-1.22.2/font -F.../groff-1.22.2/font -M.../groff-1.22.2/tmac -M.../groff-1.22.2/tmac -M. examples/mom-pdf.mom >examples/mom-pdf.pdf |
| 30 |
/bin/sh: .../groff-1.22.2/src/devices/gropdf/pdfmom: No such file or directory |
| 31 |
make[2]: *** [examples/letter.pdf] Error 127 |
| 32 |
/bin/sh: .../groff-1.22.2/src/devices/gropdf/pdfmom: No such file or directory |
| 33 |
make[2]: *** [examples/mom-pdf.pdf] Error 127 |
| 34 |
make[2]: Leaving directory `.../groff-1.22.2/contrib/mom' |
| 35 |
make[1]: *** [contrib/mom] Error 2 |
| 36 |
... |
| 37 |
make[2]: Entering directory `.../groff-1.22.2/src/devices/gropdf' |
| 38 |
sed -f .../groff-1.22.2/arch/misc/shdeps.sed \ |
| 39 |
-e "s|@VERSION@|1.22.2|" \ |
| 40 |
-e "s|@PERLPATH@|/usr/bin/perl|" ./pdfmom.pl >pdfmom |
| 41 |
|
| 42 |
The top level makefile tries to account for this in general with OTHERDIRS, |
| 43 |
but looks like src/devices/gropdf/ was added to this variable (which holds |
| 44 |
contrib/mom/ too) because gropdf installs a shell script, and the other |
| 45 |
prog vars require it to be a dir of things to compile. |
| 46 |
|
| 47 |
Declare a new prog var for holding shell scripts. |
| 48 |
|
| 49 |
URL: http://crbug.com/324116 |
| 50 |
URL: https://bugs.gentoo.org/487276 |
| 51 |
Signed-off-by: Mike Frysinger <vapier@g.o> |
| 52 |
|
| 53 |
2013-12-06 Mike Frysinger <vapier@g.o> |
| 54 |
|
| 55 |
* Makefile.in (SHPROGDIRS): Declare. |
| 56 |
(PROGDIRS): Add $(SHPROGDIRS). |
| 57 |
(OTHERDIRS): Delete src/devices/gropdf. |
| 58 |
($(SHPROGDIRS):): Add to existing rule. |
| 59 |
($(OTHERDIRS):): Depend on $(SHPROGDIRS). |
| 60 |
--- |
| 61 |
Makefile.in | 8 +++++--- |
| 62 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 63 |
|
| 64 |
diff --git a/Makefile.in b/Makefile.in |
| 65 |
index a794de7..8e478af 100644 |
| 66 |
--- a/Makefile.in |
| 67 |
+++ b/Makefile.in |
| 68 |
@@ -602,12 +602,15 @@ CCPROGDIRS=\ |
| 69 |
src/utils/addftinfo |
| 70 |
CPROGDIRS=\ |
| 71 |
src/utils/pfbtops |
| 72 |
+SHPROGDIRS=\ |
| 73 |
+ src/devices/gropdf |
| 74 |
PROGDEPDIRS=\ |
| 75 |
arch/misc |
| 76 |
PROGDIRS=\ |
| 77 |
$(PROGDEPDIRS) \ |
| 78 |
$(CCPROGDIRS) \ |
| 79 |
$(CPROGDIRS) \ |
| 80 |
+ $(SHPROGDIRS) \ |
| 81 |
$(XPROGDIRS) |
| 82 |
DEVDIRS=\ |
| 83 |
font/devps \ |
| 84 |
@@ -637,7 +640,6 @@ OTHERDIRS=\ |
| 85 |
contrib/glilypond \ |
| 86 |
contrib/hdtbl \ |
| 87 |
contrib/pdfmark \ |
| 88 |
- src/devices/gropdf \ |
| 89 |
font/devpdf \ |
| 90 |
contrib/mom \ |
| 91 |
contrib/gdiffmk |
| 92 |
@@ -778,7 +780,7 @@ $(CCPROGDIRS): FORCE $(LIBDIRS) |
| 93 |
-f $(top_srcdir)/Makefile.ccpg \ |
| 94 |
-f Makefile.dep $(do) |
| 95 |
|
| 96 |
-$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) |
| 97 |
+$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(SHPROGDIRS): FORCE $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) |
| 98 |
@$(ENVSETUP); \ |
| 99 |
if test $(srcdir) = .; then \ |
| 100 |
srcdir=.; \ |
| 101 |
@@ -809,7 +811,7 @@ $(GNULIBDIRS): FORCE |
| 102 |
$(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \ |
| 103 |
esac |
| 104 |
|
| 105 |
-$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) |
| 106 |
+$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(SHPROGDIRS) |
| 107 |
|
| 108 |
$(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE |
| 109 |
@$(ENVSETUP); \ |
| 110 |
-- |
| 111 |
1.8.4.3 |
Archives