summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhenhua Luo <zhenhua.luo@freescale.com>2013-06-26 19:48:19 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-28 09:14:06 +0100
commitd5d61146b4093eeba2adc4bb2338b1ac0dabe8c7 (patch)
treea8083160cacc42c243b5ad5e03c509ab7b94d82c
parent0450c31ca4d6daf075f59c57e6ec76a602155bab (diff)
downloadpoky-d5d61146b4093eeba2adc4bb2338b1ac0dabe8c7.tar.gz
groff: correct the install path of man.local
openvswitch build failed due to wrong install path of man.local which is provided by groff. Error log: /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local' (From OE-Core rev: 5f2dd65e758ead8177a1cdda047bdb105b96e208) Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch32
-rw-r--r--meta/recipes-extended/groff/groff_1.22.2.bb6
2 files changed, 36 insertions, 2 deletions
diff --git a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch b/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch
new file mode 100644
index 0000000000..f7e9a742f5
--- /dev/null
+++ b/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch
@@ -0,0 +1,32 @@
1Correct the install path of man.local to fix following error:
2 /yocto/build/tmp/sysroots/x86_64-linux/usr/share/groff/1.22.2/tmac/an-old.tmac:690: warning: can't find macro file `man.local'
3
4Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
5Upstream-Status: Pending
6
7--- groff-1.22.2/tmac/Makefile.sub.orig 2013-02-07 20:06:08.000000000 +0800
8+++ groff-1.22.2/tmac/Makefile.sub 2013-06-26 19:11:23.572259001 +0800
9@@ -114,9 +114,9 @@
10 rm -f $(DESTDIR)$(mdocdir)/$$f; \
11 $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
12 done
13- -test -f $(DESTDIR)$(localtmacdir)/man.local || \
14+ -test -f $(DESTDIR)$(tmacdir)/man.local || \
15 $(INSTALL_DATA) $(srcdir)/man.local \
16- $(DESTDIR)$(localtmacdir)/man.local
17+ $(DESTDIR)$(tmacdir)/man.local
18 -test -f $(DESTDIR)$(localtmacdir)/mdoc.local || \
19 $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
20
21@@ -158,9 +158,9 @@
22 -rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
23 -rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
24 -rm -f $(DESTDIR)$(tmacdir)/www.tmac
25- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
26+ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \
27 $(srcdir)/man.local; then \
28- rm -f $(DESTDIR)$(localtmacdir)/man.local; \
29+ rm -f $(DESTDIR)$(tmacdir)/man.local; \
30 fi
31 -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
32 $(srcdir)/mdoc.local; then \
diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb b/meta/recipes-extended/groff/groff_1.22.2.bb
index d1361ab8e1..dc964ae8e1 100644
--- a/meta/recipes-extended/groff/groff_1.22.2.bb
+++ b/meta/recipes-extended/groff/groff_1.22.2.bb
@@ -4,11 +4,13 @@ formatting commands and produces formatted output."
4SECTION = "base" 4SECTION = "base"
5HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/" 5HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
6LICENSE = "GPLv2" 6LICENSE = "GPLv2"
7PR = "r0" 7PR = "r1"
8 8
9LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 9LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
10 10
11SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz" 11SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
12 file://groff-1.22.2-correct-man.local-install-path.patch \
13"
12 14
13SRC_URI[md5sum] = "9f4cd592a5efc7e36481d8d8d8af6d16" 15SRC_URI[md5sum] = "9f4cd592a5efc7e36481d8d8d8af6d16"
14SRC_URI[sha256sum] = "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076" 16SRC_URI[sha256sum] = "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076"