groff: fix rare build race in hdtbl

It's possible to build the hdtbl examples before grn has been build:

groff: error: couldn't exec grn: No such file or directory

Backport a dependency fix from upstream.

[ YOCTO #15610 ]

(From OE-Core rev: 40003e1f1444f6202b068dcde632571be208594e)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit d590a32423d05cefc4e7282f971f633b3fa0b941)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Ross Burton
2024-10-14 13:24:48 +01:00
committed by Steve Sakoman
parent f4d2e59433
commit ef6f0cc60b
2 changed files with 39 additions and 0 deletions

View File

@@ -0,0 +1,38 @@
From 12169aa269341753d491a69e9adb86c58dca039a Mon Sep 17 00:00:00 2001
From: "G. Branden Robinson" <g.branden.robinson@gmail.com>
Date: Thu, 10 Oct 2024 18:17:08 -0500
Subject: [PATCH] [hdtbl]: Fix Savannah #66316 (missing `grn` dep).
* hdtbl.am (HDTBLPROCESSEDEXAMPLEFILES): Declare dependency on `grn`;
because `-I` flags are used, it is dragged in even though not
explicitly needed. Resolves race against `grn`'s availability in the
build tree.
Fixes <https://savannah.gnu.org/bugs/?66316>. Thanks to Ross Burton for
the report.
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
contrib/hdtbl/ChangeLog | 10 ++++++++++
contrib/hdtbl/hdtbl.am | 3 +--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index b6c334c18..3c37174f2 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -119,9 +119,8 @@ SUFFIXES += .roff .in .ps
&& sed -e "s|[@]fontdir[@]|$(fontdir)|" \
-e "s|[@]EGREP[@]|$(EGREP)|" $< >$@
-
$(HDTBLPROCESSEDEXAMPLEFILES): $(DOC_GNU_EPS) groff troff eqn pic tbl \
- grops font/devps/stamp contrib/hdtbl/examples/common.roff
+ grops grn font/devps/stamp contrib/hdtbl/examples/common.roff
uninstall_groffdirs: uninstall-hdtbl-hook
uninstall-hdtbl-hook:
--
2.34.1

View File

@@ -12,6 +12,7 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
file://0001-Make-manpages-mulitlib-identical.patch \
file://0001-build-Fix-Savannah-64681-webpage.ps-deps.patch \
file://0001-build-meintro_fr.ps-depends-on-tbl.patch \
file://0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch \
"
SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13"