[OE-core] [PATCH 08/10] groff: 1.22.2 -> 1.22.3
Robert Yang
liezhi.yang at windriver.com
Tue Apr 7 11:24:29 UTC 2015
* Updated groff-1.22.2-correct-man.local-install-path.patch
* Add perl to RDEPENDS_groff since /usr/bin/perf is a perl script now.
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
...off-1.22.2-correct-man.local-install-path.patch | 36 +++++++++++---------
.../groff/{groff_1.22.2.bb => groff_1.22.3.bb} | 7 ++--
2 files changed, 23 insertions(+), 20 deletions(-)
rename meta/recipes-extended/groff/{groff-1.22.2 => groff-1.22.3}/groff-1.22.2-correct-man.local-install-path.patch (40%)
rename meta/recipes-extended/groff/{groff_1.22.2.bb => groff_1.22.3.bb} (92%)
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.3/groff-1.22.2-correct-man.local-install-path.patch
similarity index 40%
rename from meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch
rename to meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
index f7e9a74..c73328a 100644
--- 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.3/groff-1.22.2-correct-man.local-install-path.patch
@@ -4,29 +4,31 @@ Correct the install path of man.local to fix following error:
Signed-off-by: Zhenhua Luo <zhenhua.luo at 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; \
+diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
+index 1506232..f1468c5 100644
+--- a/tmac/Makefile.sub
++++ b/tmac/Makefile.sub
+@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
+ $(RM) $(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
+- -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
+@@ -164,9 +164,9 @@ uninstall_sub:
+ $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
+ $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
+ $(RM) $(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; \
+- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \
++ $(RM) $(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.3.bb
similarity index 92%
rename from meta/recipes-extended/groff/groff_1.22.2.bb
rename to meta/recipes-extended/groff/groff_1.22.3.bb
index 6e84587..d89e747 100644
--- a/meta/recipes-extended/groff/groff_1.22.2.bb
+++ b/meta/recipes-extended/groff/groff_1.22.3.bb
@@ -4,7 +4,6 @@ formatting commands and produces formatted output."
SECTION = "base"
HOMEPAGE = "http://www.gnu.org/software/groff/"
LICENSE = "GPLv3"
-PR = "r1"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
@@ -12,12 +11,14 @@ 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"
+SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5"
+SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5"
DEPENDS = "groff-native"
DEPENDS_class-native = ""
+RDEPENDS_${PN} = "perl"
+
inherit autotools texinfo
EXTRA_OECONF = "--without-x"
--
1.7.9.5
More information about the Openembedded-core
mailing list