groff: Fix occasional build race failure

groff-native occasionally fails to build with a build race. Add a
patch which has been submitted upstream (details in the patch).

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-extended/groff/files/builddep.patch b/meta/recipes-extended/groff/files/builddep.patch
new file mode 100644 (file)
index 0000000..71c23d6
--- /dev/null
+++ b/meta/recipes-extended/groff/files/builddep.patch
@@ -0,0 +1,33 @@
+[mom]: Fix example build dependencies
+
+We are seeing occasional failures for eqn being missing when building
+mom examples, e.g.:
+
+| groff-1.24.0/groff: error: couldn't exec eqn: Permission denied
+| pdfmom: fatal error: groff-1.24.0/test-groff exited with status 24
+| make[2]: *** [Makefile:19256: contrib/mom/examples/slide-demo.pdf] Error 1
+
+It may find eqn from the host system if installed too.
+
+Fix the build dependencies to add eqn, pic, tbl and preconv since a 
+quick strace indicates them all being used here
+
+Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/groff.git/commit/?id=3f7d8ea20f91a8abf248fbf7ec73049cd8c3c9c2]
+
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Index: groff-1.24.0/contrib/mom/mom.am
+===================================================================
+--- groff-1.24.0.orig/contrib/mom/mom.am
++++ groff-1.24.0/contrib/mom/mom.am
+@@ -144,8 +144,8 @@ SUFFIXES += .mom .pdf
+       && LC_ALL=C $(MOMPDFMOM) $< >$@
+ 
+ $(MOMPROCESSEDEXAMPLEFILES): $(MOMNORMALFILES) \
+-  test-groff groff troff gropdf pdfmom penguin.ps penguin.pdf \
+-  font/devpdf/stamp tmac/pdf.tmac
++  test-groff groff troff gropdf pdfmom eqn pic tbl preconv \
++  penguin.ps penguin.pdf font/devpdf/stamp tmac/pdf.tmac
+ 
+ penguin.ps:
+       $(AM_V_at)cp $(mom_srcdir)/examples/penguin.ps $@

diff --git a/meta/recipes-extended/groff/groff_1.24.0.bb b/meta/recipes-extended/groff/groff_1.24.0.bb
index dbc8cdf6d0da30d4fedf6412d5d7b15cb3de9199..52cb17d5ffb5cc83ec36a6213626fff93358f5c2 100644 (file)
--- a/meta/recipes-extended/groff/groff_1.24.0.bb
+++ b/meta/recipes-extended/groff/groff_1.24.0.bb
@@ -12,6 +12,7 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
            file://0001-Make-manpages-mulitlib-identical.patch \
            file://0001-groff-fix-test-groff-not-found-in-cross-compilation.patch \
            file://0001-gropdf-use-SOURCE_DATE_EPOCH-for-reproducible-builds.patch \
+           file://builddep.patch \
            "
 
 SRC_URI[sha256sum] = "e79bbcd8ff3ed0200e7ac55d3962a15e118c1229990213025f2fc8b264727570"