summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-04-10 01:31:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-13 22:33:18 +0100
commit23a8493408f82859c7d1ac6a1b5cf52dc539d7e8 (patch)
tree1bd1ed83f32e8f429eecf446c1732de9a44fa92b /meta/recipes-extended
parent84e8b1ba296c92ec00cfc5b5077ee253c4ed65ab (diff)
downloadpoky-23a8493408f82859c7d1ac6a1b5cf52dc539d7e8.tar.gz
groff: 1.22.2 -> 1.22.3
* Updated groff-1.22.2-correct-man.local-install-path.patch * Add perl to RDEPENDS_groff since there are a few perl scripts: groff/usr/bin/roff2pdf:#! /usr/bin/env perl groff/usr/bin/afmtodit:#! /usr/bin/env perl -w groff/usr/bin/roff2dvi:#! /usr/bin/env perl groff/usr/bin/roff2text:#! /usr/bin/env perl groff/usr/bin/glilypond:#! /usr/bin/env perl groff/usr/bin/roff2ps:#! /usr/bin/env perl groff/usr/bin/gperl:#! /usr/bin/env perl groff/usr/bin/mmroff:#! /usr/bin/env perl groff/usr/bin/gpinyin:#! /usr/bin/env perl groff/usr/bin/roff2html:#! /usr/bin/env perl groff/usr/bin/grog:#! /usr/bin/env perl groff/usr/bin/gropdf:#! /usr/bin/env perl -w groff/usr/bin/pdfmom:#! /usr/bin/env perl -w groff/usr/bin/chem:#! /usr/bin/env perl groff/usr/bin/roff2x:#! /usr/bin/env perl groff/usr/bin/groffer:#! /usr/bin/env perl groff/usr/lib64/groff/gpinyin/subs.pl:#! /usr/bin/env perl groff/usr/lib64/groff/grog/subs.pl:#! /usr/bin/env perl groff/usr/lib64/groff/groffer/subs.pl:#! /usr/bin/env perl groff/usr/lib64/groff/groffer/man.pl:#! /usr/bin/env perl groff/usr/lib64/groff/groffer/main_subs.pl:#! /usr/bin/env perl * Fix the dangling /usr/bin/perl or /bin/perl for grog. (From OE-Core rev: f516c288d37e53856bce273af2cdbf24f3f5a6e1) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-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.3/groff-1.22.2-correct-man.local-install-path.patch34
-rw-r--r--meta/recipes-extended/groff/groff_1.22.3.bb (renamed from meta/recipes-extended/groff/groff_1.22.2.bb)9
3 files changed, 39 insertions, 36 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
deleted file mode 100644
index f7e9a742f5..0000000000
--- a/meta/recipes-extended/groff/groff-1.22.2/groff-1.22.2-correct-man.local-install-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
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.3/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
new file mode 100644
index 0000000000..c73328a186
--- /dev/null
+++ b/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
@@ -0,0 +1,34 @@
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
7diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
8index 1506232..f1468c5 100644
9--- a/tmac/Makefile.sub
10+++ b/tmac/Makefile.sub
11@@ -121,9 +121,9 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
12 $(RM) $(DESTDIR)$(mdocdir)/$$f; \
13 $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
14 done
15- -test -f $(DESTDIR)$(localtmacdir)/man.local \
16+ -test -f $(DESTDIR)$(tmacdir)/man.local \
17 || $(INSTALL_DATA) $(srcdir)/man.local \
18- $(DESTDIR)$(localtmacdir)/man.local
19+ $(DESTDIR)$(tmacdir)/man.local
20 -test -f $(DESTDIR)$(localtmacdir)/mdoc.local \
21 || $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
22
23@@ -164,9 +164,9 @@ uninstall_sub:
24 $(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
25 $(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
26 $(RM) $(DESTDIR)$(tmacdir)/www.tmac
27- -if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
28+ -if cmp -s $(DESTDIR)$(tmacdir)/man.local \
29 $(srcdir)/man.local; then \
30- $(RM) $(DESTDIR)$(localtmacdir)/man.local; \
31+ $(RM) $(DESTDIR)$(tmacdir)/man.local; \
32 fi
33 -if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
34 $(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
index 6e845878ac..36b221aa1f 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."
4SECTION = "base" 4SECTION = "base"
5HOMEPAGE = "http://www.gnu.org/software/groff/" 5HOMEPAGE = "http://www.gnu.org/software/groff/"
6LICENSE = "GPLv3" 6LICENSE = "GPLv3"
7PR = "r1"
8 7
9LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
10 9
@@ -12,12 +11,14 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
12 file://groff-1.22.2-correct-man.local-install-path.patch \ 11 file://groff-1.22.2-correct-man.local-install-path.patch \
13" 12"
14 13
15SRC_URI[md5sum] = "9f4cd592a5efc7e36481d8d8d8af6d16" 14SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5"
16SRC_URI[sha256sum] = "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a13d2076" 15SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5"
17 16
18DEPENDS = "groff-native" 17DEPENDS = "groff-native"
19DEPENDS_class-native = "" 18DEPENDS_class-native = ""
20 19
20RDEPENDS_${PN} = "perl"
21
21inherit autotools texinfo 22inherit autotools texinfo
22 23
23EXTRA_OECONF = "--without-x" 24EXTRA_OECONF = "--without-x"
@@ -47,7 +48,7 @@ do_configure_append() {
47do_install_append() { 48do_install_append() {
48 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location 49 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
49 # for target as /usr/bin/perl, so fix it to /usr/bin/perl. 50 # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
50 for i in afmtodit mmroff gropdf pdfmom; do 51 for i in afmtodit mmroff gropdf pdfmom grog; do
51 if [ -f ${D}${bindir}/$i ]; then 52 if [ -f ${D}${bindir}/$i ]; then
52 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/$i 53 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/$i
53 fi 54 fi