summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2019-05-12 16:16:28 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-12 17:55:11 +0100
commit66d67b818a7bb172f9ab804f9cb5b8e5b9e577f5 (patch)
tree58781fb06cfb1889afe8cb1c5951125a35858ed4 /meta
parent8e7b9685d2d27511aef2cf1ce51d688337fbd31a (diff)
downloadpoky-66d67b818a7bb172f9ab804f9cb5b8e5b9e577f5.tar.gz
groff: upgrade 1.22.3 -> 1.22.4
- Drop groff-1.22.2-correct-man.local-install-path.patch and 0001-Unset-need_charset_alias-when-building-for-musl.patch - Inherit bbclass pkgcnofig to fix `undefined macro: AC_DEFINE' ... | configure:20010: error: possibly undefined macro: AC_DEFINE ... - Use autotools-brokensep to replace autotools to workaround failure caused by out of tree ... | rm -f lib/alloca.h-t lib/alloca.h && \ | { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ | cat ../groff-1.22.4/lib/alloca.in.h; \ | } > lib/alloca.h-t && \ | mv -f lib/alloca.h-t lib/alloca.h | /bin/sh: line 4: lib/alloca.h-t: No such file or directory | Makefile:10407: recipe for target 'lib/alloca.h' failed ... - Add `--without-doc' to not use target groff to generate doc at build time, since upstream commit [cfe916e Support of configure option to build the documentation.] - Remove groff depends groff-native, and add DEPENDS bison-native - Add 0001-fix-shebang-for-taget.patch - Add 0001-support-musl.patch (From OE-Core rev: 70c2364cae3aad62877e0267d840ea3567d3d1ea) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch31
-rw-r--r--meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch (renamed from meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch)34
-rw-r--r--meta/recipes-extended/groff/files/0001-support-musl.patch46
-rw-r--r--meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch32
-rw-r--r--meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch30
-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/groff-not-search-fonts-on-build-host.patch20
-rw-r--r--meta/recipes-extended/groff/groff_1.22.4.bb (renamed from meta/recipes-extended/groff/groff_1.22.3.bb)36
8 files changed, 135 insertions, 128 deletions
diff --git a/meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch b/meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch
new file mode 100644
index 0000000000..1b94e8a937
--- /dev/null
+++ b/meta/recipes-extended/groff/files/0001-fix-shebang-for-taget.patch
@@ -0,0 +1,31 @@
1From 54c795c8a3c7356294007b5a4eed1dd47ed6411d Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 11 May 2019 19:19:27 +0800
4Subject: [PATCH] fix shebang for target
5
6...
7|ERROR: groff-1.22.4-r0 do_package_qa: QA Issue: /usr/bin/gdiffmk contained in
8package groff requires tmp-glibc/hosttools/bash, but no providers found in
9RDEPENDS_groff? [file-rdeps]
10...
11
12Upstream-Status: Inappropriate [oe-core specific]
13
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15---
16 contrib/gdiffmk/gdiffmk.sh | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/contrib/gdiffmk/gdiffmk.sh b/contrib/gdiffmk/gdiffmk.sh
20index 5ce931e..10f2300 100644
21--- a/contrib/gdiffmk/gdiffmk.sh
22+++ b/contrib/gdiffmk/gdiffmk.sh
23@@ -1,4 +1,4 @@
24-#!@BASH_PROG@
25+#!/bin/sh
26 # Copyright (C) 2004-2018 Free Software Foundation, Inc.
27 # Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
28 # Thanks to Peter Bray for debugging.
29--
302.7.4
31
diff --git a/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch
index f1db5b0653..eda6a40f51 100644
--- a/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch
+++ b/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch
@@ -1,7 +1,7 @@
1From 5b574542070db286c89b3827e8f15ed4b3b39034 Mon Sep 17 00:00:00 2001 1From 6821a23e6cf34df37c351b45be413a8da9115f9f Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 6 Apr 2017 01:46:00 -0700 3Date: Sat, 11 May 2019 17:03:03 +0800
4Subject: [PATCH] replace "perl -w" with "use warnings" 4Subject: [PATCH 1/2] replace "perl -w" with "use warnings"
5 5
6The shebang's max length is usually 128 as defined in 6The shebang's max length is usually 128 as defined in
7/usr/include/linux/binfmts.h: 7/usr/include/linux/binfmts.h:
@@ -18,6 +18,10 @@ So replace "perl -w" with "use warnings" to make it work.
18Upstream-Status: Pending 18Upstream-Status: Pending
19 19
20Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 20Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
21
22Rebase to 1.22.4.
23
24Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
21--- 25---
22 font/devpdf/util/BuildFoundries.pl | 3 ++- 26 font/devpdf/util/BuildFoundries.pl | 3 ++-
23 src/devices/gropdf/gropdf.pl | 3 ++- 27 src/devices/gropdf/gropdf.pl | 3 ++-
@@ -26,7 +30,7 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
26 4 files changed, 8 insertions(+), 4 deletions(-) 30 4 files changed, 8 insertions(+), 4 deletions(-)
27 31
28diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl 32diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl
29index 39f2f0d..a2bfd8e 100644 33index f8af826..9584e28 100644
30--- a/font/devpdf/util/BuildFoundries.pl 34--- a/font/devpdf/util/BuildFoundries.pl
31+++ b/font/devpdf/util/BuildFoundries.pl 35+++ b/font/devpdf/util/BuildFoundries.pl
32@@ -1,4 +1,4 @@ 36@@ -1,4 +1,4 @@
@@ -36,15 +40,15 @@ index 39f2f0d..a2bfd8e 100644
36 # BuildFoundries : Given a Foundry file generate groff and download files 40 # BuildFoundries : Given a Foundry file generate groff and download files
37 # Deri James : Monday 07 Feb 2011 41 # Deri James : Monday 07 Feb 2011
38@@ -22,6 +22,7 @@ 42@@ -22,6 +22,7 @@
39 # along with this program. If not, see <http://www.gnu.org/licenses/>. 43 # along with this program. If not, see <http://www.gnu.org/licenses/>.
40 44
41 use strict; 45 use strict;
42+use warnings; 46+use warnings;
43 47
48 (my $progname = $0) =~s @.*/@@;
44 my $where=shift||''; 49 my $where=shift||'';
45 my $devps=shift||'../devps';
46diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl 50diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
47index 035d123..b933b32 100644 51index 2ec52d0..ce5a06f 100644
48--- a/src/devices/gropdf/gropdf.pl 52--- a/src/devices/gropdf/gropdf.pl
49+++ b/src/devices/gropdf/gropdf.pl 53+++ b/src/devices/gropdf/gropdf.pl
50@@ -1,4 +1,4 @@ 54@@ -1,4 +1,4 @@
@@ -59,10 +63,10 @@ index 035d123..b933b32 100644
59 use strict; 63 use strict;
60+use warnings; 64+use warnings;
61 use Getopt::Long qw(:config bundling); 65 use Getopt::Long qw(:config bundling);
62 use Compress::Zlib;
63 66
67 use constant
64diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl 68diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl
65index beec820..4b46ea4 100644 69index c9b08b2..61124f3 100644
66--- a/src/devices/gropdf/pdfmom.pl 70--- a/src/devices/gropdf/pdfmom.pl
67+++ b/src/devices/gropdf/pdfmom.pl 71+++ b/src/devices/gropdf/pdfmom.pl
68@@ -1,4 +1,4 @@ 72@@ -1,4 +1,4 @@
@@ -71,8 +75,8 @@ index beec820..4b46ea4 100644
71 # 75 #
72 # pdfmom : Frontend to run groff -mom to produce PDFs 76 # pdfmom : Frontend to run groff -mom to produce PDFs
73 # Deri James : Friday 16 Mar 2012 77 # Deri James : Friday 16 Mar 2012
74@@ -24,6 +24,7 @@ 78@@ -23,6 +23,7 @@
75 # along with this program. If not, see <http://www.gnu.org/licenses/>. 79 # along with this program. If not, see <http://www.gnu.org/licenses/>.
76 80
77 use strict; 81 use strict;
78+use warnings; 82+use warnings;
@@ -80,17 +84,17 @@ index beec820..4b46ea4 100644
80 my @cmd; 84 my @cmd;
81 my $dev='pdf'; 85 my $dev='pdf';
82diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl 86diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl
83index 4f2ce83..5c078ff 100644 87index 954c58e..81a6c97 100644
84--- a/src/utils/afmtodit/afmtodit.pl 88--- a/src/utils/afmtodit/afmtodit.pl
85+++ b/src/utils/afmtodit/afmtodit.pl 89+++ b/src/utils/afmtodit/afmtodit.pl
86@@ -1,4 +1,4 @@ 90@@ -1,4 +1,4 @@
87-#! /usr/bin/perl -w 91-#! /usr/bin/perl -w
88+#! /usr/bin/perl 92+#! /usr/bin/perl
89 # -*- Perl -*- 93 # -*- Perl -*-
90 # Copyright (C) 1989-2014 Free Software Foundation, Inc. 94 # Copyright (C) 1989-2018 Free Software Foundation, Inc.
91 # Written by James Clark (jjc@jclark.com) 95 # Written by James Clark (jjc@jclark.com)
92@@ -19,6 +19,7 @@ 96@@ -19,6 +19,7 @@
93 # along with this program. If not, see <http://www.gnu.org/licenses/>. 97 # along with this program. If not, see <http://www.gnu.org/licenses/>.
94 98
95 use strict; 99 use strict;
96+use warnings; 100+use warnings;
@@ -98,5 +102,5 @@ index 4f2ce83..5c078ff 100644
98 @afmtodit.tables@ 102 @afmtodit.tables@
99 103
100-- 104--
1012.10.2 1052.7.4
102 106
diff --git a/meta/recipes-extended/groff/files/0001-support-musl.patch b/meta/recipes-extended/groff/files/0001-support-musl.patch
new file mode 100644
index 0000000000..e5c817c209
--- /dev/null
+++ b/meta/recipes-extended/groff/files/0001-support-musl.patch
@@ -0,0 +1,46 @@
1From f73df5196c35ef9c4531e4b6b26800c41954fd77 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 11 May 2019 20:00:29 +0800
4Subject: [PATCH] support musl
5
6...
7|./lib/math.h:2877:1: error: 'int signbit(float)' conflicts with a previous declaration
8| _GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit)
9| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
10|In file included from recipe-sysroot/usr/include/c++/8.3.0/math.h:36,
11| from ./lib/math.h:27,
12| from ./src/include/driver.h:27,
13| from src/devices/grodvi/dvi.cpp:20:
14|recipe-sysroot/usr/include/c++/8.3.0/cmath:661:3: note: previous declaration 'constexpr bool std::signbit(float)'
15| signbit(float __x)
16| ^~~~~~~
17...
18
19Upstream-Status: Pending
20
21Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
22---
23 lib/math.in.h | 2 ++
24 1 file changed, 2 insertions(+)
25
26diff --git a/lib/math.in.h b/lib/math.in.h
27index c30fc20..16e406a 100644
28--- a/lib/math.in.h
29+++ b/lib/math.in.h
30@@ -2397,11 +2397,13 @@ _GL_EXTERN_C int gl_signbitl (long double arg);
31 gl_signbitf (x))
32 # endif
33 # ifdef __cplusplus
34+#if defined(__GLIBC__)
35 # if defined signbit || defined GNULIB_NAMESPACE
36 _GL_MATH_CXX_REAL_FLOATING_DECL_1 (signbit)
37 # undef signbit
38 _GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit)
39 # endif
40+# endif //if defined(__GLIBC__)
41 # endif
42 #elif defined GNULIB_POSIXCHECK
43 # if defined signbit
44--
452.7.4
46
diff --git a/meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch b/meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch
new file mode 100644
index 0000000000..c80a2a5c38
--- /dev/null
+++ b/meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch
@@ -0,0 +1,32 @@
1From 75761ae7adc88412de4379d1cf5484b055cd5f18 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 11 May 2019 17:06:29 +0800
4Subject: [PATCH 2/2] groff searchs fonts which are provided by ghostscript on
5 build host. It causes non-determinism issue. So not search font dirs on host.
6
7Upstream-Status: Inappropriate [cross build specific]
8
9Signed-off-by: Kai Kang <kai.kang@windriver.com>
10
11Rebase to 1.22.4
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13---
14 font/devpdf/Foundry.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in
18index 93e9b66..235b23b 100644
19--- a/font/devpdf/Foundry.in
20+++ b/font/devpdf/Foundry.in
21@@ -65,7 +65,7 @@ ZD|Y||||Dingbats!d050000l.pfb
22 #======================================================================
23
24 #Foundry|Name|Searchpath
25-foundry|U|(gs):@urwfontsdir@ :/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different)
26+foundry|U|(gs) # the URW fonts delivered with ghostscript (may be different)
27 #Define Flags for afmtodit
28
29 r=-i 0 -m
30--
312.7.4
32
diff --git a/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
deleted file mode 100644
index b61b432818..0000000000
--- a/meta/recipes-extended/groff/groff-1.22.3/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Apr 2015 17:02:13 -0700
4Subject: [PATCH] Unset need_charset_alias when building for musl
5
6localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
7which actually shoudl be fixed in gnulib and then all downstream
8projects will get it eventually. For now we apply the fix to
9coreutils
10
11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 lib/gnulib.mk | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18Index: groff-1.22.3/src/libs/gnulib/lib/Makefile.am
19===================================================================
20--- groff-1.22.3.orig/src/libs/gnulib/lib/Makefile.am
21+++ groff-1.22.3/src/libs/gnulib/lib/Makefile.am
22@@ -113,7 +113,7 @@ install-exec-localcharset: all-local
23 case '$(host_os)' in \
24 darwin[56]*) \
25 need_charset_alias=true ;; \
26- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
27+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
28 need_charset_alias=false ;; \
29 *) \
30 need_charset_alias=true ;; \
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
deleted file mode 100644
index c73328a186..0000000000
--- a/meta/recipes-extended/groff/groff-1.22.3/groff-1.22.2-correct-man.local-install-path.patch
+++ /dev/null
@@ -1,34 +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
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.3/groff-not-search-fonts-on-build-host.patch b/meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch
deleted file mode 100644
index ff8f320592..0000000000
--- a/meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1groff searchs fonts which are provided by ghostscript on build host.
2It causes non-determinism issue. So not search font dirs on host.
3
4Upstream-Status: Inappropriate [cross build specific]
5
6Signed-off-by: Kai Kang <kai.kang@windriver.com>
7
8diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in
9index a6e968f..8094642 100644
10--- a/font/devpdf/Foundry.in
11+++ b/font/devpdf/Foundry.in
12@@ -65,7 +65,7 @@ ZD|Y||||Dingbats!d050000l.pfb
13 #======================================================================
14
15 #Foundry|Name|Searchpath
16-foundry|U|(gs):/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different)
17+foundry|U|(gs) # the URW fonts delivered with ghostscript (may be different)
18 #Define Flags for afmtodit
19
20 r=-i 0 -m
diff --git a/meta/recipes-extended/groff/groff_1.22.3.bb b/meta/recipes-extended/groff/groff_1.22.4.bb
index ba90cadd88..37eee9a6cc 100644
--- a/meta/recipes-extended/groff/groff_1.22.3.bb
+++ b/meta/recipes-extended/groff/groff_1.22.4.bb
@@ -8,49 +8,27 @@ LICENSE = "GPLv3"
8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
9 9
10SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ 10SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
11 file://groff-1.22.2-correct-man.local-install-path.patch \
12 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
13 file://0001-replace-perl-w-with-use-warnings.patch \ 11 file://0001-replace-perl-w-with-use-warnings.patch \
14 file://groff-not-search-fonts-on-build-host.patch \ 12 file://groff-not-search-fonts-on-build-host.patch \
13 file://0001-fix-shebang-for-taget.patch \
14 file://0001-support-musl.patch \
15" 15"
16 16
17SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" 17SRC_URI[md5sum] = "08fb04335e2f5e73f23ea4c3adbf0c5f"
18SRC_URI[sha256sum] = "3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5" 18SRC_URI[sha256sum] = "e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293"
19 19
20DEPENDS = "groff-native" 20DEPENDS = "bison-native"
21DEPENDS_class-native = ""
22RDEPENDS_${PN} += "perl sed" 21RDEPENDS_${PN} += "perl sed"
23 22
24inherit autotools texinfo multilib_script 23inherit autotools-brokensep texinfo multilib_script pkgconfig
25 24
26MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bindir}/grog" 25MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bindir}/grog"
27 26
28EXTRA_OECONF = "--without-x" 27EXTRA_OECONF = "--without-x --without-doc"
29PARALLEL_MAKE = "" 28PARALLEL_MAKE = ""
30 29
31CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" 30CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'"
32 31
33do_configure_prepend() {
34 if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
35 sed -i \
36 -e '/^GROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/groff:' \
37 -e '/^TROFFBIN=/s:=.*:=${STAGING_BINDIR_NATIVE}/troff:' \
38 -e '/^GROFF_BIN_PATH=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
39 -e '/^GROFF_BIN_DIR=/s:=.*:=${STAGING_BINDIR_NATIVE}:' \
40 ${S}/contrib/*/Makefile.sub \
41 ${S}/doc/Makefile.in \
42 ${S}/doc/Makefile.sub
43 fi
44}
45
46do_configure_append() {
47 # generate gnulib configure script
48 olddir=`pwd`
49 cd ${S}/src/libs/gnulib/
50 ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || die "autoreconf execution failed."
51 cd ${olddir}
52}
53
54do_install_append() { 32do_install_append() {
55 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location 33 # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
56 # for target as /usr/bin/perl, so fix it to /usr/bin/perl. 34 # for target as /usr/bin/perl, so fix it to /usr/bin/perl.