summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Puhlman <jpuhlman@mvista.com>2020-03-07 06:05:48 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-08 08:21:11 +0000
commit1f41f116173153cf0684270636ee7a7a599f690c (patch)
tree24bc61f39028e707165647c4b21090f9385d1cb1
parenta41a9ad3134b9f3391ad79ad7e2c14a8bf3bcc0f (diff)
downloadpoky-1f41f116173153cf0684270636ee7a7a599f690c.tar.gz
groff: Make manpages binary identical
(From OE-Core rev: b78a0cf49a4efb02cffc12e199de526e13391482) Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch27
-rw-r--r--meta/recipes-extended/groff/groff_1.22.4.bb1
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
new file mode 100644
index 0000000000..9105da6457
--- /dev/null
+++ b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
@@ -0,0 +1,27 @@
1From e738f9185ba90f2083c846ade3551234bb5a7cbc Mon Sep 17 00:00:00 2001
2From: Jeremy Puhlman <jpuhlman@mvista.com>
3Date: Sat, 7 Mar 2020 00:59:13 +0000
4Subject: [PATCH] Make manpages mulitlib identical
5
6Upstream-Status: Pending
7Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
8---
9 Makefile.am | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/Makefile.am b/Makefile.am
13index d18c49b..6175fe9 100644
14--- a/Makefile.am
15+++ b/Makefile.am
16@@ -917,7 +917,7 @@ SUFFIXES += .man
17 -e "s|[@]MDATE[@]|`$(PERL) $(top_srcdir)/mdate.pl $<`|g" \
18 -e "s|[@]OLDFONTDIR[@]|`echo $(oldfontdir) | sed -f $(makevarescape)`|g" \
19 -e "s|[@]PDFDOCDIR[@]|`echo $(pdfdocdir) | sed -f $(makevarescape)`|g" \
20- -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -f $(makevarescape)`|g" \
21+ -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -e 's,$(libdir),$(prefix)/lib*,' | sed -f $(makevarescape)`|g" \
22 -e "s|[@]TMAC_AN_PREFIX[@]|$(tmac_an_prefix)|g" \
23 -e "s|[@]TMAC_M_PREFIX[@]|$(tmac_m_prefix)|g" \
24 -e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \
25--
262.23.0
27
diff --git a/meta/recipes-extended/groff/groff_1.22.4.bb b/meta/recipes-extended/groff/groff_1.22.4.bb
index 082597f693..e398478349 100644
--- a/meta/recipes-extended/groff/groff_1.22.4.bb
+++ b/meta/recipes-extended/groff/groff_1.22.4.bb
@@ -12,6 +12,7 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
12 file://groff-not-search-fonts-on-build-host.patch \ 12 file://groff-not-search-fonts-on-build-host.patch \
13 file://0001-support-musl.patch \ 13 file://0001-support-musl.patch \
14 file://0001-Include-config.h.patch \ 14 file://0001-Include-config.h.patch \
15 file://0001-Make-manpages-mulitlib-identical.patch \
15" 16"
16 17
17SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f" 18SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f"