Patchwork groff: correct the install path of man.local

login
register
mail settings
Submitter Zhenhua Luo
Date June 26, 2013, 11:48 a.m.
Message ID <1372247299-5054-1-git-send-email-zhenhua.luo@freescale.com>
Download mbox | patch
Permalink /patch/52369/
State Accepted
Commit 5f2dd65e758ead8177a1cdda047bdb105b96e208
Headers show

Comments

Zhenhua Luo - June 26, 2013, 11:48 a.m.
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'

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
---
 ...off-1.22.2-correct-man.local-install-path.patch |   32 ++++++++++++++++++++
 meta/recipes-extended/groff/groff_1.22.2.bb        |    6 ++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch

Patch

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 0000000..f7e9a74
--- /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 @@ 
+Correct the install path of man.local to fix following error:
+    /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'
+
+Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
+Upstream-Status: Pending
+
+--- groff-1.22.2/tmac/Makefile.sub.orig	2013-02-07 20:06:08.000000000 +0800
++++ groff-1.22.2/tmac/Makefile.sub	2013-06-26 19:11:23.572259001 +0800
+@@ -114,9 +114,9 @@
+ 	  rm -f $(DESTDIR)$(mdocdir)/$$f; \
+ 	  $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
+ 	done
+-	-test -f $(DESTDIR)$(localtmacdir)/man.local || \
++	-test -f $(DESTDIR)$(tmacdir)/man.local || \
+ 	  $(INSTALL_DATA) $(srcdir)/man.local \
+-	    $(DESTDIR)$(localtmacdir)/man.local
++	    $(DESTDIR)$(tmacdir)/man.local
+ 	-test -f $(DESTDIR)$(localtmacdir)/mdoc.local || \
+ 	  $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
+ 
+@@ -158,9 +158,9 @@
+ 	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
+ 	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
+ 	-rm -f $(DESTDIR)$(tmacdir)/www.tmac
+-	-if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
++	-if cmp -s $(DESTDIR)$(tmacdir)/man.local \
+ 	           $(srcdir)/man.local; then \
+-	  rm -f $(DESTDIR)$(localtmacdir)/man.local; \
++	  rm -f $(DESTDIR)$(tmacdir)/man.local; \
+ 	fi
+ 	-if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
+ 	           $(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 d1361ab..dc964ae 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."
 SECTION = "base"
 HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
 LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
+	file://groff-1.22.2-correct-man.local-install-path.patch \
+"
 
 SRC_URI[md5sum] = "9f4cd592a5efc7e36481d8d8d8af6d16"
 SRC_URI[sha256sum] = "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076"