summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/groff/files
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/recipes-extended/groff/files
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/recipes-extended/groff/files')
-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.patch106
-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
4 files changed, 215 insertions, 0 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/files/0001-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch
new file mode 100644
index 0000000000..eda6a40f51
--- /dev/null
+++ b/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch
@@ -0,0 +1,106 @@
1From 6821a23e6cf34df37c351b45be413a8da9115f9f Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sat, 11 May 2019 17:03:03 +0800
4Subject: [PATCH 1/2] replace "perl -w" with "use warnings"
5
6The shebang's max length is usually 128 as defined in
7/usr/include/linux/binfmts.h:
8 #define BINPRM_BUF_SIZE 128
9
10There would be errors when @PERL@ is longer than 128, use
11'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w'
12doesn't work:
13
14/usr/bin/env: perl -w: No such file or directory
15
16So replace "perl -w" with "use warnings" to make it work.
17
18Upstream-Status: Pending
19
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>
25---
26 font/devpdf/util/BuildFoundries.pl | 3 ++-
27 src/devices/gropdf/gropdf.pl | 3 ++-
28 src/devices/gropdf/pdfmom.pl | 3 ++-
29 src/utils/afmtodit/afmtodit.pl | 3 ++-
30 4 files changed, 8 insertions(+), 4 deletions(-)
31
32diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl
33index f8af826..9584e28 100644
34--- a/font/devpdf/util/BuildFoundries.pl
35+++ b/font/devpdf/util/BuildFoundries.pl
36@@ -1,4 +1,4 @@
37-#!/usr/bin/perl -w
38+#!/usr/bin/perl
39 #
40 # BuildFoundries : Given a Foundry file generate groff and download files
41 # Deri James : Monday 07 Feb 2011
42@@ -22,6 +22,7 @@
43 # along with this program. If not, see <http://www.gnu.org/licenses/>.
44
45 use strict;
46+use warnings;
47
48 (my $progname = $0) =~s @.*/@@;
49 my $where=shift||'';
50diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
51index 2ec52d0..ce5a06f 100644
52--- a/src/devices/gropdf/gropdf.pl
53+++ b/src/devices/gropdf/gropdf.pl
54@@ -1,4 +1,4 @@
55-#!@PERL@ -w
56+#!@PERL@
57 #
58 # gropdf : PDF post processor for groff
59 #
60@@ -21,6 +21,7 @@
61 # along with this program. If not, see <http://www.gnu.org/licenses/>.
62
63 use strict;
64+use warnings;
65 use Getopt::Long qw(:config bundling);
66
67 use constant
68diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl
69index c9b08b2..61124f3 100644
70--- a/src/devices/gropdf/pdfmom.pl
71+++ b/src/devices/gropdf/pdfmom.pl
72@@ -1,4 +1,4 @@
73-#!@PERL@ -w
74+#!@PERL@
75 #
76 # pdfmom : Frontend to run groff -mom to produce PDFs
77 # Deri James : Friday 16 Mar 2012
78@@ -23,6 +23,7 @@
79 # along with this program. If not, see <http://www.gnu.org/licenses/>.
80
81 use strict;
82+use warnings;
83 use File::Temp qw/tempfile/;
84 my @cmd;
85 my $dev='pdf';
86diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl
87index 954c58e..81a6c97 100644
88--- a/src/utils/afmtodit/afmtodit.pl
89+++ b/src/utils/afmtodit/afmtodit.pl
90@@ -1,4 +1,4 @@
91-#! /usr/bin/perl -w
92+#! /usr/bin/perl
93 # -*- Perl -*-
94 # Copyright (C) 1989-2018 Free Software Foundation, Inc.
95 # Written by James Clark (jjc@jclark.com)
96@@ -19,6 +19,7 @@
97 # along with this program. If not, see <http://www.gnu.org/licenses/>.
98
99 use strict;
100+use warnings;
101
102 @afmtodit.tables@
103
104--
1052.7.4
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