summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/groff/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/groff/files')
-rw-r--r--meta/recipes-extended/groff/files/0001-Include-config.h.patch208
-rw-r--r--meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch22
-rw-r--r--meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch51
-rw-r--r--meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.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.patch41
-rw-r--r--meta/recipes-extended/groff/files/groff-not-search-fonts-on-build-host.patch37
7 files changed, 114 insertions, 382 deletions
diff --git a/meta/recipes-extended/groff/files/0001-Include-config.h.patch b/meta/recipes-extended/groff/files/0001-Include-config.h.patch
deleted file mode 100644
index 46065bc513..0000000000
--- a/meta/recipes-extended/groff/files/0001-Include-config.h.patch
+++ /dev/null
@@ -1,208 +0,0 @@
1From 6cfa9f8126c1d6ec26f120d273e714fb19108873 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 4 Aug 2019 16:32:41 -0700
4Subject: [PATCH] Include config.h
5
6This helps avoid the include conflicts where <stdlib.h> is including
7<math.h> and since -I./lib is used and a local math.h wrapper is
8residing in there, the build breaks since stdlib.h really wants the
9standard system math.h to be included, this ensures that right macros
10are predefined and included before stdlib.h is included
11
12fixes
13In file included from src/libs/libgroff/assert.cpp:20:
14In file included from TOPDIR/build/tmp/work/aarch64-yoe-linux-musl/groff/1.22.4-r0/recipe-sysroot/usr/include/c++/v1/stdlib.h:100:
15./lib/math.h:38:3: error: "Please include config.h first."
16 #error "Please include config.h first."
17 ^
18./lib/math.h:40:1: error: unknown type name '_GL_INLINE_HEADER_BEGIN'
19
20We delete eqn.cpp and qen.hpp in do_configure
21to ensure they're regenerated and deterministic.
22
23Upstream-Status: Pending
24Signed-off-by: Khem Raj <raj.khem@gmail.com>
25---
26 src/libs/libgroff/assert.cpp | 4 +
27 src/libs/libgroff/curtime.cpp | 4 +
28 src/libs/libgroff/device.cpp | 4 +
29 src/libs/libgroff/error.cpp | 4 +
30 src/libs/libgroff/fatal.cpp | 4 +
31 src/libs/libgroff/string.cpp | 4 +
32 src/libs/libgroff/strsave.cpp | 4 +
33 src/preproc/eqn/eqn.cpp | 450 ++++++++++++++++++----------------
34 src/preproc/eqn/eqn.hpp | 12 +-
35 src/preproc/eqn/eqn.ypp | 4 +
36 src/preproc/eqn/other.cpp | 4 +
37 src/preproc/eqn/text.cpp | 4 +
38 src/preproc/pic/object.cpp | 4 +
39 13 files changed, 285 insertions(+), 221 deletions(-)
40
41diff --git a/src/libs/libgroff/assert.cpp b/src/libs/libgroff/assert.cpp
42index aceed05..97780d6 100644
43--- a/src/libs/libgroff/assert.cpp
44+++ b/src/libs/libgroff/assert.cpp
45@@ -16,6 +16,10 @@ for more details.
46 You should have received a copy of the GNU General Public License
47 along with this program. If not, see <http://www.gnu.org/licenses/>. */
48
49+#if HAVE_CONFIG_H
50+# include <config.h>
51+#endif
52+
53 #include <stdio.h>
54 #include <stdlib.h>
55 #include "assert.h"
56diff --git a/src/libs/libgroff/curtime.cpp b/src/libs/libgroff/curtime.cpp
57index 72fe067..9ddba08 100644
58--- a/src/libs/libgroff/curtime.cpp
59+++ b/src/libs/libgroff/curtime.cpp
60@@ -15,6 +15,10 @@ for more details.
61 The GNU General Public License version 2 (GPL2) is available in the
62 internet at <http://www.gnu.org/licenses/gpl-2.0.txt>. */
63
64+#if HAVE_CONFIG_H
65+# include <config.h>
66+#endif
67+
68 #include <errno.h>
69 #include <limits.h>
70 #include <stdlib.h>
71diff --git a/src/libs/libgroff/device.cpp b/src/libs/libgroff/device.cpp
72index 0d28b85..c211f85 100644
73--- a/src/libs/libgroff/device.cpp
74+++ b/src/libs/libgroff/device.cpp
75@@ -17,6 +17,10 @@ for more details.
76 You should have received a copy of the GNU General Public License
77 along with this program. If not, see <http://www.gnu.org/licenses/>. */
78
79+#if HAVE_CONFIG_H
80+# include <config.h>
81+#endif
82+
83 #include <stdlib.h>
84 #include "device.h"
85 #include "defs.h"
86diff --git a/src/libs/libgroff/error.cpp b/src/libs/libgroff/error.cpp
87index 9a18803..7b63d3d 100644
88--- a/src/libs/libgroff/error.cpp
89+++ b/src/libs/libgroff/error.cpp
90@@ -17,6 +17,10 @@ for more details.
91 You should have received a copy of the GNU General Public License
92 along with this program. If not, see <http://www.gnu.org/licenses/>. */
93
94+#if HAVE_CONFIG_H
95+# include <config.h>
96+#endif
97+
98 #include <stdio.h>
99 #include <stdlib.h>
100 #include <string.h>
101diff --git a/src/libs/libgroff/fatal.cpp b/src/libs/libgroff/fatal.cpp
102index c0dcb35..fd6003e 100644
103--- a/src/libs/libgroff/fatal.cpp
104+++ b/src/libs/libgroff/fatal.cpp
105@@ -16,6 +16,10 @@ for more details.
106 You should have received a copy of the GNU General Public License
107 along with this program. If not, see <http://www.gnu.org/licenses/>. */
108
109+#if HAVE_CONFIG_H
110+# include <config.h>
111+#endif
112+
113 #include <stdlib.h>
114
115 #define FATAL_ERROR_EXIT_CODE 3
116diff --git a/src/libs/libgroff/string.cpp b/src/libs/libgroff/string.cpp
117index 46c015c..449f3a6 100644
118--- a/src/libs/libgroff/string.cpp
119+++ b/src/libs/libgroff/string.cpp
120@@ -17,6 +17,10 @@ for more details.
121 You should have received a copy of the GNU General Public License
122 along with this program. If not, see <http://www.gnu.org/licenses/>. */
123
124+#if HAVE_CONFIG_H
125+# include <config.h>
126+#endif
127+
128 #include <stdlib.h>
129
130 #include "lib.h"
131diff --git a/src/libs/libgroff/strsave.cpp b/src/libs/libgroff/strsave.cpp
132index f95c05e..d875045 100644
133--- a/src/libs/libgroff/strsave.cpp
134+++ b/src/libs/libgroff/strsave.cpp
135@@ -17,6 +17,10 @@ for more details.
136 You should have received a copy of the GNU General Public License
137 along with this program. If not, see <http://www.gnu.org/licenses/>. */
138
139+#if HAVE_CONFIG_H
140+# include <config.h>
141+#endif
142+
143 #include <string.h>
144 #include <stdlib.h>
145
146diff --git a/src/preproc/eqn/eqn.ypp b/src/preproc/eqn/eqn.ypp
147index fb318c3..b7b647e 100644
148--- a/src/preproc/eqn/eqn.ypp
149+++ b/src/preproc/eqn/eqn.ypp
150@@ -16,6 +16,10 @@ for more details.
151 You should have received a copy of the GNU General Public License
152 along with this program. If not, see <http://www.gnu.org/licenses/>. */
153 %{
154+#if HAVE_CONFIG_H
155+# include <config.h>
156+#endif
157+
158 #include <stdio.h>
159 #include <string.h>
160 #include <stdlib.h>
161diff --git a/src/preproc/eqn/other.cpp b/src/preproc/eqn/other.cpp
162index 8db993f..38db396 100644
163--- a/src/preproc/eqn/other.cpp
164+++ b/src/preproc/eqn/other.cpp
165@@ -17,6 +17,10 @@ for more details.
166 You should have received a copy of the GNU General Public License
167 along with this program. If not, see <http://www.gnu.org/licenses/>. */
168
169+#if HAVE_CONFIG_H
170+# include <config.h>
171+#endif
172+
173 #include <stdlib.h>
174
175 #include "eqn.h"
176diff --git a/src/preproc/eqn/text.cpp b/src/preproc/eqn/text.cpp
177index f3d06f9..3b244d5 100644
178--- a/src/preproc/eqn/text.cpp
179+++ b/src/preproc/eqn/text.cpp
180@@ -17,6 +17,10 @@ for more details.
181 You should have received a copy of the GNU General Public License
182 along with this program. If not, see <http://www.gnu.org/licenses/>. */
183
184+#if HAVE_CONFIG_H
185+# include <config.h>
186+#endif
187+
188 #include <ctype.h>
189 #include <stdlib.h>
190 #include "eqn.h"
191diff --git a/src/preproc/pic/object.cpp b/src/preproc/pic/object.cpp
192index d8ba610..f26a831 100644
193--- a/src/preproc/pic/object.cpp
194+++ b/src/preproc/pic/object.cpp
195@@ -17,6 +17,10 @@ for more details.
196 You should have received a copy of the GNU General Public License
197 along with this program. If not, see <http://www.gnu.org/licenses/>. */
198
199+#if HAVE_CONFIG_H
200+# include <config.h>
201+#endif
202+
203 #include <stdlib.h>
204
205 #include "pic.h"
206--
2072.22.0
208
diff --git a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
index 9105da6457..6dc84c9062 100644
--- a/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
+++ b/meta/recipes-extended/groff/files/0001-Make-manpages-mulitlib-identical.patch
@@ -1,27 +1,25 @@
1From e738f9185ba90f2083c846ade3551234bb5a7cbc Mon Sep 17 00:00:00 2001 1From aa1f37f1e0ff0dc0eeb199b52959e0deb275721e Mon Sep 17 00:00:00 2001
2From: Jeremy Puhlman <jpuhlman@mvista.com> 2From: Jeremy Puhlman <jpuhlman@mvista.com>
3Date: Sat, 7 Mar 2020 00:59:13 +0000 3Date: Sat, 7 Mar 2020 00:59:13 +0000
4Subject: [PATCH] Make manpages mulitlib identical 4Subject: [PATCH] Make manpages mulitlib identical
5 5
6Upstream-Status: Pending 6Upstream-Status: Submitted [by email to g.branden.robinson@gmail.com]
7Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> 7Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
8
8--- 9---
9 Makefile.am | 2 +- 10 Makefile.am | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
11 12
12diff --git a/Makefile.am b/Makefile.am 13diff --git a/Makefile.am b/Makefile.am
13index d18c49b..6175fe9 100644 14index f7ab410..7e1f3fb 100644
14--- a/Makefile.am 15--- a/Makefile.am
15+++ b/Makefile.am 16+++ b/Makefile.am
16@@ -917,7 +917,7 @@ SUFFIXES += .man 17@@ -891,7 +891,7 @@ SUFFIXES += .man
17 -e "s|[@]MDATE[@]|`$(PERL) $(top_srcdir)/mdate.pl $<`|g" \ 18 -e "s|[@]PAGE[@]|\\\\%$(PAGE)|g" \
18 -e "s|[@]OLDFONTDIR[@]|`echo $(oldfontdir) | sed -f $(makevarescape)`|g" \
19 -e "s|[@]PDFDOCDIR[@]|`echo $(pdfdocdir) | sed -f $(makevarescape)`|g" \ 19 -e "s|[@]PDFDOCDIR[@]|`echo $(pdfdocdir) | sed -f $(makevarescape)`|g" \
20 -e "s|[@]PSPRINT[@]|`echo $(PSPRINT) | sed -f $(makevarescape)`|g" \
20- -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -f $(makevarescape)`|g" \ 21- -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -f $(makevarescape)`|g" \
21+ -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -e 's,$(libdir),$(prefix)/lib*,' | sed -f $(makevarescape)`|g" \ 22+ -e "s|[@]SYSTEMMACRODIR[@]|`echo $(systemtmacdir) | sed -e 's,$(libdir),$(prefix)/lib*,' | sed -f $(makevarescape)`|g" \
22 -e "s|[@]TMAC_AN_PREFIX[@]|$(tmac_an_prefix)|g" \ 23 -e "s|[@]TMAC_AN_PREFIX[@]|\\\\%$(tmac_an_prefix)|g" \
23 -e "s|[@]TMAC_M_PREFIX[@]|$(tmac_m_prefix)|g" \ 24 -e "s|[@]TMAC_M_PREFIX[@]|\\\\%$(tmac_m_prefix)|g" \
24 -e "s|[@]TMAC_MDIR[@]|$(tmacdir)/mm|g" \ 25 -e "s|[@]TMAC_MDIR[@]|`echo $(tmacdir) | sed -f $(makevarescape)`/mm|g" \
25--
262.23.0
27
diff --git a/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch b/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch
new file mode 100644
index 0000000000..eae5dc9998
--- /dev/null
+++ b/meta/recipes-extended/groff/files/0001-build-Fix-Savannah-64681-webpage.ps-deps.patch
@@ -0,0 +1,51 @@
1From c75965053124149381ada3c394da74be078076cf Mon Sep 17 00:00:00 2001
2From: "G. Branden Robinson" <g.branden.robinson@gmail.com>
3Date: Sat, 16 Sep 2023 16:28:00 -0500
4Subject: [PATCH] [build]: Fix Savannah #64681 (webpage.ps deps).
5
6* doc/doc.am (doc/webpage.ps, doc/webpage.html): Update and parallelize
7 target dependencies. Resolve race by requiring "grn" and "soelim" to
8 be built first. Also add dependency on `$(TMAC_PACKAGE_MS)`.
9
10Fixes <https://savannah.gnu.org/bugs/?64681>. Thanks to Alexander
11Kanavin for the report.
12
13ANNOUNCE: Acknowledge Alexander.
14
15Upstream-Status: Backport
16Signed-off-by: Alexander Kanavin <alex@linutronix.de>
17---
18 doc/doc.am | 12 ++++++++----
19 1 file changed, 8 insertions(+), 4 deletions(-)
20
21diff --git a/doc/doc.am b/doc/doc.am
22index cddc51907..d3c9ab6b7 100644
23--- a/doc/doc.am
24+++ b/doc/doc.am
25@@ -346,6 +346,9 @@ doc/pic.ps: $(doc_srcdir)/pic.ms eqn pic tbl
26 $(GROFF_V)$(MKDIR_P) `dirname $@` \
27 && $(DOC_GROFF) -pet -Tps -ms $(doc_srcdir)/pic.ms >$@
28
29+# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and
30+# soelim even though the document doesn't require them.
31+doc/webpage.ps: grn soelim
32 doc/webpage.ps: $(DOC_GNU_EPS) tmac/www.tmac tbl
33 doc/webpage.ps: $(doc_srcdir)/webpage.ms
34 $(GROFF_V)$(MKDIR_P) `dirname $@` \
35@@ -365,11 +368,12 @@ doc/pic.html: $(doc_srcdir)/pic.ms
36 && $(DOC_GROFF) -pet -P-Ipic -P-Dimg -P-jpic -Thtml -ms \
37 $(doc_srcdir)/pic.ms > pic.html
38
39-doc/webpage.html: tbl
40-doc/webpage.html: tmac/www.tmac
41-doc/webpage.html: $(DOC_GNU_EPS)
42+# groff(1)'s `-I` implies `-g` and `-s`, so we must depend on grn and
43+# soelim even though the document doesn't require them.
44+doc/webpage.html: grn soelim
45+doc/webpage.html: $(DOC_GNU_EPS) tmac/www.tmac tbl
46 doc/webpage.html: $(doc_srcdir)/groff.css
47-doc/webpage.html: $(doc_srcdir)/webpage.ms
48+doc/webpage.html: $(doc_srcdir)/webpage.ms $(TMAC_PACKAGE_MS)
49 $(GROFF_V)$(MKDIR_P) $(doc_builddir) \
50 && cd $(doc_builddir) \
51 && $(DOC_GROFF) -t -I $(doc_srcdir) -P-jwebpage -P-nrb \
diff --git a/meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch b/meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch
new file mode 100644
index 0000000000..3e81b86ac8
--- /dev/null
+++ b/meta/recipes-extended/groff/files/0001-build-meintro_fr.ps-depends-on-tbl.patch
@@ -0,0 +1,31 @@
1From f21e9f13beb57a1e0666edf9693d7c83f2189897 Mon Sep 17 00:00:00 2001
2From: "G. Branden Robinson" <g.branden.robinson@gmail.com>
3Date: Fri, 22 Sep 2023 01:27:57 -0500
4Subject: [PATCH] [build]: meintro_fr.ps depends on tbl.
5
6* doc/doc.am (doc/meintro_fr.ps): Depend on tbl, resolving race in
7 sufficiently parallelized builds. Overlooked in commit 92349ae223,
8 2022-05-30.
9
10Fixes <https://savannah.gnu.org/bugs/?64695>. Thanks to Alexander
11Kanavin for the report.
12
13Upstream-Status: Backport
14Signed-off-by: Alexander Kanavin <alex@linutronix.de>
15---
16 doc/doc.am | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/doc/doc.am b/doc/doc.am
20index d3c9ab6b7..0f95c7774 100644
21--- a/doc/doc.am
22+++ b/doc/doc.am
23@@ -334,7 +334,7 @@ SUFFIXES += .me.in .me
24
25 # Use '-K utf8', not '-k', in case 'configure' didn't find uchardet.
26 # The French translation uses tbl; its English counterpart does not.
27-doc/meintro_fr.ps: doc/meintro_fr.me preconv
28+doc/meintro_fr.ps: doc/meintro_fr.me preconv tbl
29 $(GROFF_V)$(MKDIR_P) `dirname $@` \
30 && $(DOC_GROFF) -K utf8 -t -Tps -me -mfr $< >$@
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
deleted file mode 100644
index eda6a40f51..0000000000
--- a/meta/recipes-extended/groff/files/0001-replace-perl-w-with-use-warnings.patch
+++ /dev/null
@@ -1,106 +0,0 @@
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
deleted file mode 100644
index a837b11b1b..0000000000
--- a/meta/recipes-extended/groff/files/0001-support-musl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 695965c27be74acb5968f19d51af86065c4b71a9 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 13 May 2019 09:48:14 +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: Backport [http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=453ff940449bbbde9ec00f0bbf82a359c5598fc7]
20
21Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
22---
23 gnulib_m4/signbit.m4 | 2 ++
24 1 file changed, 2 insertions(+)
25
26diff --git a/gnulib_m4/signbit.m4 b/gnulib_m4/signbit.m4
27index 9e7884d..8b9c70c 100644
28--- a/gnulib_m4/signbit.m4
29+++ b/gnulib_m4/signbit.m4
30@@ -31,6 +31,8 @@ AC_DEFUN([gl_SIGNBIT],
31 [case "$host_os" in
32 # Guess yes on glibc systems.
33 *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;;
34+ # Guess yes on musl systems.
35+ *-musl*) gl_cv_func_signbit="guessing yes" ;;
36 # Guess yes on native Windows.
37 mingw*) gl_cv_func_signbit="guessing yes" ;;
38 # If we don't know, assume the worst.
39--
402.7.4
41
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
index c80a2a5c38..23992576f9 100644
--- 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
@@ -1,7 +1,7 @@
1From 75761ae7adc88412de4379d1cf5484b055cd5f18 Mon Sep 17 00:00:00 2001 1From eb16276c3e2e34aa2e57f6a0e68554657b90cd28 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 11 May 2019 17:06:29 +0800 3Date: Sat, 11 May 2019 17:06:29 +0800
4Subject: [PATCH 2/2] groff searchs fonts which are provided by ghostscript on 4Subject: [PATCH] groff searchs fonts which are provided by ghostscript on
5 build host. It causes non-determinism issue. So not search font dirs on host. 5 build host. It causes non-determinism issue. So not search font dirs on host.
6 6
7Upstream-Status: Inappropriate [cross build specific] 7Upstream-Status: Inappropriate [cross build specific]
@@ -10,23 +10,30 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
10 10
11Rebase to 1.22.4 11Rebase to 1.22.4
12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 12Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
13
13--- 14---
14 font/devpdf/Foundry.in | 2 +- 15 font/devpdf/Foundry.in | 4 ++--
15 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 2 insertions(+), 2 deletions(-)
16 17
17diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in 18diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in
18index 93e9b66..235b23b 100644 19index e5aba65..5441734 100644
19--- a/font/devpdf/Foundry.in 20--- a/font/devpdf/Foundry.in
20+++ b/font/devpdf/Foundry.in 21+++ b/font/devpdf/Foundry.in
21@@ -65,7 +65,7 @@ ZD|Y||||Dingbats!d050000l.pfb 22@@ -20,7 +20,7 @@
22 #======================================================================
23 23
24 #Foundry|Name|Searchpath 24 #=======================================================================
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) 25 #Foundry|Name|Search path
26+foundry|U|(gs) # the URW fonts delivered with ghostscript (may be different) 26-foundry||@urwfontsdir@:(gs):/usr/share/fonts/type1/gsfonts:/usr/share/fonts/default/Type1:/usr/share/fonts/default/Type1/adobestd35:/usr/share/fonts/type1/urw-base35:/opt/local/share/fonts/urw-fonts:/usr/local/share/fonts/ghostscript
27 #Define Flags for afmtodit 27+foundry||(gs)
28
29 # Enable the font description files for grops (generated from Adobe
30 # foundry font files) to be used with gropdf. afmtodit must not be
31@@ -72,7 +72,7 @@ EURO|N||||*../devps/freeeuro.pfa
32 # URW fonts are typically shipped with Ghostscript, but can be replaced.
33
34 #Foundry|Name|Search path
35-foundry|U|@urwfontsdir@:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/default/Type1:/usr/share/fonts/default/Type1/adobestd35:/usr/share/fonts/type1/urw-base35:/opt/local/share/fonts/urw-fonts:/usr/local/share/fonts/ghostscript:(gs)
36+foundry|U|(gs)
37
38 # Define flags for afmtodit.
28 39
29 r=-i 0 -m
30--
312.7.4
32
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-24 19:37:37 +0000